+/*
+ * 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;
public class Console
{
- public static JLoggerLog4j log;
+ public static JLoggerLog4j log=null;
public static void debug(String message, Throwable t)
{
System.out.println(message);
t.printStackTrace();
}
-
+
}
public static void info(String message)
{
System.out.println(message);
}
-
+
}
public static void trace(String message, Throwable t)
{
System.out.println(message);
}
-
+
}
public static void info(String message, Throwable t)
System.out.println(message);
t.printStackTrace();
}
-
+
}
public static void warn(String message)
{
System.out.println(message);
}
-
+
}
public static void trace(String message)
System.out.println(message);
t.printStackTrace();
}
-
+
}
public static void error(String message)
{
System.err.println(message);
}
-
+
}
public static void error(String message, Throwable t)
System.err.println(message);
t.printStackTrace(System.err);
}
-
+
}
public static void fatal(String message)
{
System.err.println(message);
}
-
+
}
public static void fatal(String message, Throwable t)
System.err.println(message);
t.printStackTrace(System.err);
}
-
+
}
public static boolean isDebugEnabled()
}
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);
// is laxis used? Does getLogger do anything without a Logger object?
// Logger laxis = Log4j.getLogger("org.apache.axis", myLevel);
JLoggerLog4j.getLogger("org.apache.axis", cachedLevel);
-
+
// 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");
e.printStackTrace();
}
-
+
// Test message
if (log != null)
{