From 9705e7754d8ae9acf718cf6de3d4114050160a77 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 14:27:05 +0800 Subject: [PATCH 1/6] fix/ROCKETMQ-42: Add a output before printing the stack, improve the readability of the output --- .../org/apache/rocketmq/broker/BrokerStartup.java | 1 + .../apache/rocketmq/filtersrv/FiltersrvStartup.java | 9 ++++++--- .../org/apache/rocketmq/namesrv/NamesrvStartup.java | 6 ++++-- .../rocketmq/tools/command/MQAdminStartup.java | 12 ++++++++---- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index 5b15d7953c8..da258364e2e 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -65,6 +65,7 @@ public static BrokerController start(BrokerController controller) { log.info(tip); return controller; } catch (Throwable e) { + System.out.printf("Broker startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); } diff --git a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java index 5dd15dd5320..2cbca0211df 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java @@ -48,7 +48,8 @@ public static FiltersrvController start(FiltersrvController controller) { try { controller.start(); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); System.exit(-1); } @@ -120,7 +121,7 @@ public static FiltersrvController createController(String[] args) { System.exit(-2); } - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); @@ -155,7 +156,9 @@ public void run() { }, "ShutdownHook")); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { + System.out.printf("Filtersrv startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); } diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index 4fa97ad0a45..53ec73a86c0 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -102,7 +102,7 @@ public static NamesrvController main0(String[] args) { System.exit(-2); } - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); @@ -149,7 +149,9 @@ public void run() { System.out.printf(tip + "%n"); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { + System.out.printf("Namesrv startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index fdf8e219d6d..11890c8ba7b 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -100,7 +100,8 @@ public static void main0(String[] args, RPCHook rpcHook) { if (options != null) { ServerUtil.printCommandLineHelp("mqadmin " + cmd.commandName(), options); } - } else { + } + else { System.out.printf("The sub command \'" + args[1] + "\' not exist.%n"); } break; @@ -126,12 +127,15 @@ public static void main0(String[] args, RPCHook rpcHook) { } cmd.execute(commandLine, options, rpcHook); - } else { + } + else { System.out.printf("The sub command \'" + args[0] + "\' not exist.%n"); } break; } - } catch (Exception e) { + } + catch (Exception e) { + System.out.printf("MQAdmin startup failure with following exceptions:"); e.printStackTrace(); } } @@ -194,7 +198,7 @@ public static void initCommand() { private static void initLogback() throws JoranException { String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); From 544638da77f475f9b8cec052ba86bfaac3876f73 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 14:32:17 +0800 Subject: [PATCH 2/6] fix/ROCKETMQ-42: fix style-check failure agai. --- .../java/org/apache/rocketmq/tools/command/MQAdminStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index 11890c8ba7b..2f065d70920 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -198,7 +198,7 @@ public static void initCommand() { private static void initLogback() throws JoranException { String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); From 44bc3d35387bb574ab376c8e3f76caf56a33506e Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 14:53:30 +0800 Subject: [PATCH 3/6] fix/ROCKETMQ-42: fix white space again. --- .../org/apache/rocketmq/broker/BrokerStartup.java | 14 +++++++++----- .../rocketmq/tools/command/MQAdminStartup.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index da258364e2e..1ab8c05e201 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -64,7 +64,8 @@ public static BrokerController start(BrokerController controller) { log.info(tip); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { System.out.printf("Broker startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); @@ -110,7 +111,8 @@ public static BrokerController createBrokerController(String[] args) { MixAll.printObjectProperties(null, nettyClientConfig); MixAll.printObjectProperties(null, messageStoreConfig); System.exit(0); - } else if (commandLine.hasOption('m')) { + } + else if (commandLine.hasOption('m')) { MixAll.printObjectProperties(null, brokerConfig, true); MixAll.printObjectProperties(null, nettyServerConfig, true); MixAll.printObjectProperties(null, nettyClientConfig, true); @@ -152,7 +154,8 @@ public static BrokerController createBrokerController(String[] args) { for (String addr : addrArray) { RemotingUtil.string2SocketAddress(addr); } - } catch (Exception e) { + } + catch (Exception e) { System.out.printf( "The Name Server Address[%s] illegal, please set it as follows, \"127.0.0.1:9876;192.168.0.1:9876\"%n", namesrvAddr); @@ -177,7 +180,7 @@ public static BrokerController createBrokerController(String[] args) { } messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); @@ -223,7 +226,8 @@ public void run() { }, "ShutdownHook")); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { e.printStackTrace(); System.exit(-1); } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index 2f065d70920..11890c8ba7b 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -198,7 +198,7 @@ public static void initCommand() { private static void initLogback() throws JoranException { String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); From 15d86f3f7ee90085fb895289119f2f7b91b86a20 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 15:28:55 +0800 Subject: [PATCH 4/6] fix/ROCKETMQ-42: quick fix --- .../src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 1 + 1 file changed, 1 insertion(+) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index 1ab8c05e201..4103b8a5417 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -180,6 +180,7 @@ else if (commandLine.hasOption('m')) { } messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); From 0bffd7a9bf0dbf9ebae76704f1af3822e817b8c0 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 15:35:47 +0800 Subject: [PATCH 5/6] fix/ROCKETMQ-42: fix style-check. --- .../src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 2 +- .../java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java | 2 +- .../main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 2 +- .../java/org/apache/rocketmq/tools/command/MQAdminStartup.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index 4103b8a5417..b79ca29e675 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -181,7 +181,7 @@ else if (commandLine.hasOption('m')) { messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1); - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); diff --git a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java index 2cbca0211df..66960eeff0e 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java @@ -121,7 +121,7 @@ public static FiltersrvController createController(String[] args) { System.exit(-2); } - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index 53ec73a86c0..c37e1b18dbd 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -102,7 +102,7 @@ public static NamesrvController main0(String[] args) { System.exit(-2); } - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index 11890c8ba7b..2f065d70920 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -198,7 +198,7 @@ public static void initCommand() { private static void initLogback() throws JoranException { String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); From 206254cfbaf3647f134423bbf980ebe2c9ddc0e2 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 13 Jan 2017 18:08:24 +0800 Subject: [PATCH 6/6] Auto-format is stil failure. Done with manual-format. --- .../org/apache/rocketmq/broker/BrokerStartup.java | 12 ++++-------- .../apache/rocketmq/filtersrv/FiltersrvStartup.java | 6 ++---- .../rocketmq/tools/command/MQAdminStartup.java | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index b79ca29e675..96daa46f957 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -64,8 +64,7 @@ public static BrokerController start(BrokerController controller) { log.info(tip); return controller; - } - catch (Throwable e) { + } catch (Throwable e) { System.out.printf("Broker startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); @@ -111,8 +110,7 @@ public static BrokerController createBrokerController(String[] args) { MixAll.printObjectProperties(null, nettyClientConfig); MixAll.printObjectProperties(null, messageStoreConfig); System.exit(0); - } - else if (commandLine.hasOption('m')) { + } else if (commandLine.hasOption('m')) { MixAll.printObjectProperties(null, brokerConfig, true); MixAll.printObjectProperties(null, nettyServerConfig, true); MixAll.printObjectProperties(null, nettyClientConfig, true); @@ -154,8 +152,7 @@ else if (commandLine.hasOption('m')) { for (String addr : addrArray) { RemotingUtil.string2SocketAddress(addr); } - } - catch (Exception e) { + } catch (Exception e) { System.out.printf( "The Name Server Address[%s] illegal, please set it as follows, \"127.0.0.1:9876;192.168.0.1:9876\"%n", namesrvAddr); @@ -227,8 +224,7 @@ public void run() { }, "ShutdownHook")); return controller; - } - catch (Throwable e) { + } catch (Throwable e) { e.printStackTrace(); System.exit(-1); } diff --git a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java index 66960eeff0e..07ab47917c7 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java @@ -48,8 +48,7 @@ public static FiltersrvController start(FiltersrvController controller) { try { controller.start(); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); System.exit(-1); } @@ -156,8 +155,7 @@ public void run() { }, "ShutdownHook")); return controller; - } - catch (Throwable e) { + } catch (Throwable e) { System.out.printf("Filtersrv startup failure with following exceptions:"); e.printStackTrace(); System.exit(-1); diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index 2f065d70920..6a0c3edab8b 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -100,8 +100,7 @@ public static void main0(String[] args, RPCHook rpcHook) { if (options != null) { ServerUtil.printCommandLineHelp("mqadmin " + cmd.commandName(), options); } - } - else { + } else { System.out.printf("The sub command \'" + args[1] + "\' not exist.%n"); } break; @@ -127,14 +126,12 @@ public static void main0(String[] args, RPCHook rpcHook) { } cmd.execute(commandLine, options, rpcHook); - } - else { + } else { System.out.printf("The sub command \'" + args[0] + "\' not exist.%n"); } break; } - } - catch (Exception e) { + } catch (Exception e) { System.out.printf("MQAdmin startup failure with following exceptions:"); e.printStackTrace(); }