Merge branch 'ACCUMULO-4409-custom-appender'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cbdf02e3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbdf02e3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbdf02e3 Branch: refs/heads/master Commit: cbdf02e330a5de7ad5d224a295befa33d99cfc18 Parents: 861db79 5afbacc Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Mar 8 20:52:22 2017 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Mar 8 20:52:22 2017 -0500 ---------------------------------------------------------------------- assemble/bin/accumulo | 10 +- assemble/conf/log4j-monitor.properties | 14 +- assemble/conf/log4j-service.properties | 38 ++-- assemble/conf/log4j.properties | 12 +- assemble/conf/templates/accumulo-env.sh | 51 +++-- .../org/apache/accumulo/server/Accumulo.java | 17 +- .../server/watcher/Log4jConfiguration.java | 59 ----- .../server/watcher/MonitorLog4jWatcher.java | 152 ------------- .../server/watcher/MonitorLog4jWatcherTest.java | 50 ----- .../monitor/util/AccumuloMonitorAppender.java | 222 +++++++++++++++++++ .../util/AccumuloMonitorAppenderTest.java | 184 +++++++++++++++ .../start/util/AsyncSocketAppender.java | 111 ---------- .../start/util/AsyncSocketAppenderTest.java | 78 ------- 13 files changed, 479 insertions(+), 519 deletions(-) ----------------------------------------------------------------------
