JAL-4109 examine -Djalview.loglevel on startup to decide what the default log level...

[jalview.git] / src / jalview / bin / Console.java

diff --git a/src/jalview/bin/Console.java b/src/jalview/bin/Console.java
index 4eb83aa..53ff753 100644 (file)
--- a/src/jalview/bin/Console.java
+++ b/src/jalview/bin/Console.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.bin;
 
 import jalview.log.JLogger;
@@ -10,7 +30,7 @@ import jalview.util.Platform;
 public class Console
 {
 
-  public static JLoggerLog4j log;
+  public static JLoggerLog4j log=null;
 
   public static void debug(String message, Throwable t)
   {
@@ -200,7 +220,14 @@ public class Console
     }
     try
     {
-      JLogger.LogLevel cachedLevel = getCachedLogLevel();
+      JLogger.LogLevel cachedLevel=null;
+      if (System.getProperty("jalview.loglevel")!=null)
+      {
+        cachedLevel = JLogger.LogLevel.valueOf(System.getProperty("jalview.loglevel"));
+      }
+      if (cachedLevel==null) {
+        cachedLevel = getCachedLogLevel();
+      }
       if (!Platform.isJS())
       {
         Log4j.init(cachedLevel);
@@ -212,6 +239,7 @@ public class Console
 
       // The main application logger
       log = JLoggerLog4j.getLogger(Cache.JALVIEW_LOGGER_NAME, cachedLevel);
+      log.info("Logging initialised at level: "+cachedLevel);
     } catch (NoClassDefFoundError e)
     {
       System.err.println("Could not initialise the logger framework");