SLIDER-509 more diagnostics logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7dcdd1cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7dcdd1cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7dcdd1cb Branch: refs/heads/develop Commit: 7dcdd1cb2a633e8d4562ff20a0b5f12c793e4ba4 Parents: 2c55c43 Author: Steve Loughran <ste...@apache.org> Authored: Tue Oct 14 15:45:16 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Oct 14 15:45:16 2014 -0700 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 32 +++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7dcdd1cb/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index e44db3b..2cbbeb1 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -2587,14 +2587,14 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe private void actionDiagnosticClient(ActionDiagnosticArgs diagnosticArgs) throws SliderException, IOException { - String currentCommandPath = SliderUtils.getCurrentCommandPath(); - SliderVersionInfo.loadAndPrintVersionInfo(log); - String clientConfigPath = SliderUtils.getClientConfigPath(); - String jdkInfo = SliderUtils.getJDKInfo(); - log.info("The slider command path: " + currentCommandPath); - log.info("The slider-client.xml used by current running command path: " - + clientConfigPath); - log.info(jdkInfo); + String currentCommandPath = SliderUtils.getCurrentCommandPath(); + SliderVersionInfo.loadAndPrintVersionInfo(log); + String clientConfigPath = SliderUtils.getClientConfigPath(); + String jdkInfo = SliderUtils.getJDKInfo(); + println("The slider command path: " + currentCommandPath); + println("The slider-client.xml used by current running command path: " + + clientConfigPath); + println(jdkInfo); // verbose? if (diagnosticArgs.verbose) { @@ -2608,11 +2608,11 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe .append(env.get(key)) .append("\n"); } - log.info(builder.toString()); + println(builder.toString()); // then the config - log.info("Slider client configuration:\n" + - ConfigHelper.dumpConfigToString(getConfig())); + println("Slider client configuration:\n" + + ConfigHelper.dumpConfigToString(getConfig())); } try { @@ -2868,6 +2868,16 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe private static void print(CharSequence src) { System.out.append(src); } + + /** + * Output to standard out/stderr with a newline after + * @param src source + */ + private static void println(CharSequence src) { + print(src); + print("\n"); + } + }