Merge branch 'log4j-changes' of https://github.com/kishorvpatil/incubator-storm into STORM-833
STORM-833: Logging framework logback -> log4j 2.x Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6aeef56a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6aeef56a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6aeef56a Branch: refs/heads/0.10.x-branch Commit: 6aeef56a4684d57e457392c5130db6ab277cbd42 Parents: 2154048 32e11b9 Author: Robert (Bobby) Evans <[email protected]> Authored: Thu Jun 4 13:01:54 2015 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Thu Jun 4 13:01:54 2015 -0500 ---------------------------------------------------------------------- bin/storm-config.cmd | 4 +- bin/storm.py | 33 +++++--- conf/log4j2.xml | 32 ++++++++ conf/logback.xml | 28 ------- log4j2/cluster.xml | 76 +++++++++++++++++ log4j2/worker.xml | 77 ++++++++++++++++++ logback/cluster.xml | 85 -------------------- logback/worker.xml | 41 ---------- pom.xml | 25 ++++-- storm-core/pom.xml | 12 ++- .../src/clj/backtype/storm/daemon/logviewer.clj | 11 +-- .../src/clj/backtype/storm/daemon/nimbus.clj | 5 +- .../clj/backtype/storm/daemon/supervisor.clj | 14 +++- .../src/clj/backtype/storm/daemon/worker.clj | 2 +- storm-core/src/clj/backtype/storm/util.clj | 9 ++- storm-core/src/jvm/backtype/storm/Config.java | 11 +++ .../src/jvm/backtype/storm/LogWriter.java | 83 +++++++++++++++++++ .../test/clj/backtype/storm/logviewer_test.clj | 8 +- .../test/clj/backtype/storm/supervisor_test.clj | 30 ++++++- storm-dist/binary/src/main/assembly/binary.xml | 8 +- 20 files changed, 398 insertions(+), 196 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-core/src/clj/backtype/storm/daemon/worker.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-core/src/jvm/backtype/storm/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-dist/binary/src/main/assembly/binary.xml ----------------------------------------------------------------------
