Migrate from logback to log4j2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/32e11b96 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/32e11b96 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/32e11b96 Branch: refs/heads/0.10.x-branch Commit: 32e11b962b2ea39ffe1f3c199989a223e9d8ffeb Parents: 28558b3 Author: Kishor Patil <[email protected]> Authored: Tue Jun 2 21:51:10 2015 +0000 Committer: Kishor Patil <[email protected]> Committed: Wed Jun 3 14:52:49 2015 +0000 ---------------------------------------------------------------------- bin/storm.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/32e11b96/bin/storm.py ---------------------------------------------------------------------- diff --git a/bin/storm.py b/bin/storm.py index 1f371b2..ba89304 100755 --- a/bin/storm.py +++ b/bin/storm.py @@ -177,13 +177,15 @@ def parse_args(string): args = [re.compile(r"'((?:[^'\\]|\\.)*)'").sub('\\1', x) for x in args] return [re.compile(r'\\(.)').sub('\\1', x) for x in args] -def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False, daemon=True): +def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False, daemon=True, daemonName=""): global CONFFILE storm_log_dir = confvalue("storm.log.dir",[CLUSTER_CONF_DIR]) if(storm_log_dir == None or storm_log_dir == "nil"): storm_log_dir = os.path.join(STORM_DIR, "logs") all_args = [ - "java", jvmtype, get_config_opts(), + JAVA_CMD, jvmtype, + "-Ddaemon.name=" + daemonName, + get_config_opts(), "-Dstorm.home=" + STORM_DIR, "-Dstorm.log.dir=" + storm_log_dir, "-Djava.library.path=" + confvalue("java.library.path", extrajars, daemon), @@ -345,12 +347,12 @@ def nimbus(klass="backtype.storm.daemon.nimbus"): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("nimbus.childopts", cppaths)) + [ "-Dlogfile.name=nimbus.log", - "-Ddaemon.name=nimbus", "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"), ] exec_storm_class( klass, jvmtype="-server", + daemonName="nimbus", extrajars=cppaths, jvmopts=jvmopts) @@ -366,12 +368,12 @@ def supervisor(klass="backtype.storm.daemon.supervisor"): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("supervisor.childopts", cppaths)) + [ "-Dlogfile.name=supervisor.log", - "-Ddaemon.name=supervisor", "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"), ] exec_storm_class( klass, jvmtype="-server", + daemonName="supervisor", extrajars=cppaths, jvmopts=jvmopts) @@ -388,12 +390,12 @@ def ui(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("ui.childopts", cppaths)) + [ "-Dlogfile.name=ui.log", - "-Ddaemon.name=ui", "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml") ] exec_storm_class( "backtype.storm.ui.core", jvmtype="-server", + daemonName="ui", jvmopts=jvmopts, extrajars=[STORM_DIR, CLUSTER_CONF_DIR]) @@ -410,12 +412,12 @@ def logviewer(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("logviewer.childopts", cppaths)) + [ "-Dlogfile.name=logviewer.log", - "-Ddaemon.name=logviewer", "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml") ] exec_storm_class( "backtype.storm.daemon.logviewer", jvmtype="-server", + daemonName="logviewer", jvmopts=jvmopts, extrajars=[STORM_DIR, CLUSTER_CONF_DIR]) @@ -431,12 +433,12 @@ def drpc(): cppaths = [CLUSTER_CONF_DIR] jvmopts = parse_args(confvalue("drpc.childopts", cppaths)) + [ "-Dlogfile.name=drpc.log", - "-Ddaemon.name=drpc", "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml") ] exec_storm_class( "backtype.storm.daemon.drpc", jvmtype="-server", + daemonName="drpc", jvmopts=jvmopts, extrajars=[CLUSTER_CONF_DIR])
