STORM-248 Removed useless STORM_LOGBACK_FILE_PATH from bin/storm python script
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/51dcc6b8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/51dcc6b8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/51dcc6b8 Branch: refs/heads/master Commit: 51dcc6b81bd787ca0941aab9d8b382537527cc79 Parents: fba310a Author: fmazoyer <[email protected]> Authored: Wed Jan 7 11:14:37 2015 +0100 Committer: fmazoyer <[email protected]> Committed: Wed Jan 7 11:14:37 2015 +0100 ---------------------------------------------------------------------- bin/storm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/51dcc6b8/bin/storm ---------------------------------------------------------------------- diff --git a/bin/storm b/bin/storm index a2e641d..c5d0840 100755 --- a/bin/storm +++ b/bin/storm @@ -74,8 +74,7 @@ if (not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml"))): STORM_RELEASE_DIR = os.path.join(STORM_DIR, "RELEASE") STORM_LIB_DIR = os.path.join(STORM_DIR, "lib") STORM_BIN_DIR = os.path.join(STORM_DIR, "bin") -STORM_LOGBACK_DIR = os.path.join(STORM_DIR, "logback") -STORM_LOGBACK_FILE_PATH = os.path.join(STORM_LOGBACK_DIR, "cluster.xml") +STORM_LOGBACK_CONF_DIR = os.path.join(STORM_DIR, "logback") init_storm_env() @@ -317,7 +316,7 @@ def get_logback_conf_dir(): cppaths = [CLUSTER_CONF_DIR] storm_logback_conf_dir = confvalue("storm.logback.conf.dir", cppaths) if(storm_logback_conf_dir == None or storm_logback_conf_dir == "nil"): - storm_logback_conf_dir = STORM_LOGBACK_DIR + storm_logback_conf_dir = STORM_LOGBACK_CONF_DIR return storm_logback_conf_dir def nimbus(klass="backtype.storm.daemon.nimbus"):
