Repository: incubator-blur Updated Branches: refs/heads/apache-blur-0.2 e0c1f6823 -> 97931740a
Fixed BLUR-337 Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/97931740 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/97931740 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/97931740 Branch: refs/heads/apache-blur-0.2 Commit: 97931740a4a80ba258750a3de463540be2b0110c Parents: e0c1f68 Author: Aaron McCurry <[email protected]> Authored: Thu Mar 6 18:05:21 2014 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Mar 6 18:05:21 2014 -0500 ---------------------------------------------------------------------- .../blur/thrift/ThriftBlurControllerServer.java | 25 ++++++++++------- .../blur/thrift/ThriftBlurShardServer.java | 29 ++++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/97931740/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java index c0a8175..cd06b6b 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java @@ -77,15 +77,20 @@ public class ThriftBlurControllerServer extends ThriftServer { private static final Log LOG = LogFactory.getLog(ThriftBlurControllerServer.class); public static void main(String[] args) throws Exception { - int serverIndex = getServerIndex(args); - LOG.info("Setting up Controller Server"); - BlurConfiguration configuration = new BlurConfiguration(); - printUlimits(); - ReporterSetup.setupReporters(configuration); - MemoryReporter.enable(); - setupJvmMetrics(); - ThriftServer server = createServer(serverIndex, configuration, false); - server.start(); + try { + int serverIndex = getServerIndex(args); + LOG.info("Setting up Controller Server"); + BlurConfiguration configuration = new BlurConfiguration(); + printUlimits(); + ReporterSetup.setupReporters(configuration); + MemoryReporter.enable(); + setupJvmMetrics(); + ThriftServer server = createServer(serverIndex, configuration, false); + server.start(); + } catch (Throwable t) { + t.printStackTrace(); + System.exit(1); + } } public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration, boolean randomPort) @@ -182,7 +187,7 @@ public class ThriftBlurControllerServer extends ThriftServer { } else { httpServer = null; } - + if (httpServer != null) { WebAppContext context = httpServer.getContext(); context.addServlet(new ServletHolder(new TServlet(new Blur.Processor<Blur.Iface>(iface), http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/97931740/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java index 7ee5f07..2c9fc92 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java @@ -108,18 +108,23 @@ public class ThriftBlurShardServer extends ThriftServer { private static final long _64MB = 64 * 1024 * 1024; public static void main(String[] args) throws Exception { - int serverIndex = getServerIndex(args); - LOG.info("Setting up Shard Server"); - Thread.setDefaultUncaughtExceptionHandler(new SimpleUncaughtExceptionHandler()); - BlurConfiguration configuration = new BlurConfiguration(); - printUlimits(); - ReporterSetup.setupReporters(configuration); - MemoryReporter.enable(); - setupJvmMetrics(); - // make this configurable - GCWatcher.init(0.75); - ThriftServer server = createServer(serverIndex, configuration, false); - server.start(); + try { + int serverIndex = getServerIndex(args); + LOG.info("Setting up Shard Server"); + Thread.setDefaultUncaughtExceptionHandler(new SimpleUncaughtExceptionHandler()); + BlurConfiguration configuration = new BlurConfiguration(); + printUlimits(); + ReporterSetup.setupReporters(configuration); + MemoryReporter.enable(); + setupJvmMetrics(); + // make this configurable + GCWatcher.init(0.75); + ThriftServer server = createServer(serverIndex, configuration, false); + server.start(); + } catch (Throwable t) { + t.printStackTrace(); + System.exit(1); + } } public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration, boolean randomPort)
