You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/04/06 13:02:18 UTC
ambari git commit: AMBARI-15729. ambari-server script not able to
load log4.properties other than the default location. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk c31a07770 -> b2be40bfa
AMBARI-15729. ambari-server script not able to load log4.properties other than the default location. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2be40bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2be40bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2be40bf
Branch: refs/heads/trunk
Commit: b2be40bfa87ca6e6eeb98bcc744b907d415be6c7
Parents: c31a077
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Apr 6 14:02:10 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Apr 6 14:02:10 2016 +0300
----------------------------------------------------------------------
ambari-server/src/main/python/ambari_server/serverConfiguration.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b2be40bf/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 5a0c8e8..446b083 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -330,7 +330,7 @@ class ServerConfigDefaults(object):
self.JAVA_SHARE_PATH = "/usr/share/java"
self.SHARE_PATH = "/usr/share"
- self.OUT_DIR = parse_log4j_file(AmbariPath.get("/etc/ambari-server/conf/log4j.properties"))['ambari.log.dir'].replace("//", "/")
+ self.OUT_DIR = parse_log4j_file(get_conf_dir() + "/log4j.properties")['ambari.log.dir'].replace("//", "/")
self.SERVER_OUT_FILE = os.path.join(self.OUT_DIR, "ambari-server.out")
self.SERVER_LOG_FILE = os.path.join(self.OUT_DIR, "ambari-server.log")
self.ROOT_FS_PATH = os.sep