X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FConsole.java;h=1bb81622fac7dc1831e426af83d1f2785e7f7fbc;hb=ccc53e88e3260886f5d3bdacc619c0f374be9b8f;hp=c42d5195a451c3dd8a1cc79b7c64b9ac7e4c96e5;hpb=c932f0e85a8852824cdd8ce790af68682732c85c;p=jalview.git

diff --git a/src/jalview/bin/Console.java b/src/jalview/bin/Console.java
index c42d519..1bb8162 100644
--- a/src/jalview/bin/Console.java
+++ b/src/jalview/bin/Console.java
@@ -21,10 +21,8 @@
 package jalview.bin;
 
 import java.io.PrintStream;
-import java.util.Locale;
 
 import jalview.log.JLogger;
-import jalview.log.JLoggerI;
 import jalview.log.JLoggerI.LogLevel;
 import jalview.log.JLoggerLog4j;
 import jalview.util.ChannelProperties;
@@ -241,7 +239,7 @@ public class Console
     {
       JLogger.LogLevel logLevel = JLogger.LogLevel.INFO;
 
-      if (JLogger.isLevel(providedLogLevel))
+      if (providedLogLevel != null && JLogger.isLevel(providedLogLevel))
       {
         logLevel = Console.getLogLevel(providedLogLevel);
       }
@@ -292,19 +290,23 @@ public class Console
 
   public static void setLogLevel(String logLevelString)
   {
-    for (LogLevel logLevel : JLoggerI.LogLevel.values())
+    LogLevel l = null;
+    try
+    {
+      l = LogLevel.valueOf(logLevelString);
+    } catch (IllegalArgumentException | NullPointerException e1)
+    {
+      Console.debug("Invalid log level '" + logLevelString + "'");
+      return;
+    }
+    if (l != null)
     {
-      if (logLevel.toString().toLowerCase(Locale.ROOT)
-              .equals(logLevelString.toLowerCase(Locale.ROOT)))
+      log.setLevel(l);
+      if (!Platform.isJS())
       {
-        log.setLevel(logLevel);
-        if (!Platform.isJS())
-        {
-          Log4j.init(logLevel);
-        }
-        JLoggerLog4j.getLogger("org.apache.axis", logLevel);
-        break;
+        Log4j.init(l);
       }
+      JLoggerLog4j.getLogger("org.apache.axis", l);
     }
   }
 
@@ -337,8 +339,8 @@ public class Console
   {
     // send message to stderr if an output file to stdout is expected
     if (!forceStdout && Jalview.getInstance() != null
-            && Jalview.getInstance().bootstrapArgs != null
-            && Jalview.getInstance().bootstrapArgs.outputToStdout())
+            && Jalview.getInstance().getBootstrapArgs() != null
+            && Jalview.getInstance().getBootstrapArgs().outputToStdout())
     {
       return System.err;
     }
@@ -382,6 +384,16 @@ public class Console
     System.err.println(message);
   }
 
+  public static void debugPrintStackTrace(Throwable t)
+  {
+    if (!isDebugEnabled())
+    {
+      return;
+    }
+    // send message to stderr if output to stdout is expected
+    printStackTrace(t);
+  }
+
   public static void printStackTrace(Throwable t)
   {
     // send message to stderr if output to stdout is expected