Merge branch 'master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59ecd21b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59ecd21b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59ecd21b Branch: refs/heads/ACCUMULO-378 Commit: 59ecd21baeaa499853682bb19f86ab4757706a8d Parents: 102ec71 ab45354 Author: Josh Elser <els...@apache.org> Authored: Mon May 5 12:50:58 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon May 5 12:50:58 2014 -0400 ---------------------------------------------------------------------- conf/templates/generic_logger.properties | 58 ++++++++++ conf/templates/monitor_logger.properties | 44 ++++++++ .../accumulo/core/util/AsyncSocketAppender.java | 112 +++++++++++++++++++ .../core/util/AsyncSocketAppenderTest.java | 79 +++++++++++++ .../org/apache/accumulo/server/Accumulo.java | 39 ++++++- .../server/watcher/MonitorLog4jWatcher.java | 19 +++- .../apache/accumulo/server/AccumuloTest.java | 51 +++++++++ .../server/watcher/MonitorLog4jWatcherTest.java | 50 +++++++++ .../test/functional/ConfigurableMacIT.java | 3 + .../test/functional/MonitorLoggingIT.java | 101 +++++++++++++++++ test/src/test/resources/conf/generic_logger.xml | 83 ++++++++++++++ test/src/test/resources/conf/monitor_logger.xml | 64 +++++++++++ 12 files changed, 694 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
