Repository: accumulo Updated Branches: refs/heads/1.6 82f173496 -> 679a1c3eb refs/heads/1.7 ffd50280b -> 371db68cf
ACCUMULO-4422 Initialize logging as first step in server initialization. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/679a1c3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/679a1c3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/679a1c3e Branch: refs/heads/1.6 Commit: 679a1c3eb9013d8bb0640a617392f921f096b158 Parents: 82f1734 Author: Sean Busbey <bus...@cloudera.com> Authored: Wed Aug 24 10:04:01 2016 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Wed Aug 24 10:04:01 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++-- .../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++-- .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++-- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 6d50e94..0191f38 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -136,9 +136,9 @@ public class SimpleGarbageCollector implements Iface { private Instance instance; public static void main(String[] args) throws UnknownHostException, IOException { - SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); final String app = "gc"; Accumulo.setupLogging(app); + SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); Instance instance = HdfsZooInstance.getInstance(); log.info("Version " + Constants.VERSION); log.info("Instance " + instance.getInstanceID()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index cc4a02f..14bdd6b 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -1156,13 +1156,13 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt public static void main(String[] args) throws Exception { try { + final String app = "master"; + Accumulo.setupLogging(app); SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); ServerOpts opts = new ServerOpts(); - final String app = "master"; opts.parseArgs(app, args); String hostname = opts.getAddress(); - Accumulo.setupLogging(app); Instance instance = HdfsZooInstance.getInstance(); ServerConfiguration conf = new ServerConfiguration(instance); VolumeManager fs = VolumeManagerImpl.get(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 4e162c3..e5ba9e4 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -422,14 +422,14 @@ public class Monitor { } public static void main(String[] args) throws Exception { + final String app = "monitor"; + Accumulo.setupLogging(app); SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); ServerOpts opts = new ServerOpts(); - final String app = "monitor"; opts.parseArgs(app, args); String hostname = opts.getAddress(); - Accumulo.setupLogging(app); VolumeManager fs = VolumeManagerImpl.get(); instance = HdfsZooInstance.getInstance(); config = new ServerConfiguration(instance); http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java ---------------------------------------------------------------------- diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index 1df10a3..ebfed9c 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@ -292,11 +292,11 @@ public class TraceServer implements Watcher { } public static void main(String[] args) throws Exception { + final String app = "tracer"; + Accumulo.setupLogging(app); SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); ServerOpts opts = new ServerOpts(); - final String app = "tracer"; opts.parseArgs(app, args); - Accumulo.setupLogging(app); Instance instance = HdfsZooInstance.getInstance(); ServerConfiguration conf = new ServerConfiguration(instance); VolumeManager fs = VolumeManagerImpl.get(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 8155ea6..2fdae29 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -3736,12 +3736,12 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu public static void main(String[] args) throws IOException { try { + final String app = "tserver"; + Accumulo.setupLogging(app); SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration()); ServerOpts opts = new ServerOpts(); - final String app = "tserver"; opts.parseArgs(app, args); String hostname = opts.getAddress(); - Accumulo.setupLogging(app); final Instance instance = HdfsZooInstance.getInstance(); ServerConfiguration conf = new ServerConfiguration(instance); VolumeManager fs = VolumeManagerImpl.get();
