Repository: ambari Updated Branches: refs/heads/trunk d5d1afea8 -> c9f4bcc6c
AMBARI-15483. Part 2.Strange paths in ambari-server setup.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9f4bcc6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9f4bcc6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9f4bcc6 Branch: refs/heads/trunk Commit: c9f4bcc6c3ddd4729941132bdb7b2af1e94bd7a0 Parents: d5d1afe Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Mon Mar 28 12:48:30 2016 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Mon Mar 28 12:49:17 2016 +0300 ---------------------------------------------------------------------- ambari-server/sbin/ambari-server | 1 + ambari-server/src/main/python/ambari_server/serverConfiguration.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f4bcc6/ambari-server/sbin/ambari-server ---------------------------------------------------------------------- diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server index c77b2e9..5b5bd91 100755 --- a/ambari-server/sbin/ambari-server +++ b/ambari-server/sbin/ambari-server @@ -37,6 +37,7 @@ esac SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export ROOT=`dirname $(dirname $SCRIPT_DIR)` +ROOT=`echo $ROOT | sed 's/\/$//'` export PATH=$ROOT/usr/lib/ambari-server/*:$PATH:/sbin/:/usr/sbin export AMBARI_CONF_DIR=$ROOT/etc/ambari-server/conf http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f4bcc6/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 a5e7bee..2d49b9a 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -327,7 +327,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'] + self.OUT_DIR = parse_log4j_file(AmbariPath.get("/etc/ambari-server/conf/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
