git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4298 Fixed initial log level to see .jalview_properties setting. Moved Java Conso...
[jalview.git]
/
src
/
jalview
/
bin
/
Console.java
diff --git
a/src/jalview/bin/Console.java
b/src/jalview/bin/Console.java
index
1b230ec
..
1bb8162
100644
(file)
--- a/
src/jalview/bin/Console.java
+++ b/
src/jalview/bin/Console.java
@@
-21,10
+21,8
@@
package jalview.bin;
import java.io.PrintStream;
package jalview.bin;
import java.io.PrintStream;
-import java.util.Locale;
import jalview.log.JLogger;
import jalview.log.JLogger;
-import jalview.log.JLoggerI;
import jalview.log.JLoggerI.LogLevel;
import jalview.log.JLoggerLog4j;
import jalview.util.ChannelProperties;
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;
{
JLogger.LogLevel logLevel = JLogger.LogLevel.INFO;
- if (JLogger.isLevel(providedLogLevel))
+ if (providedLogLevel != null && JLogger.isLevel(providedLogLevel))
{
logLevel = Console.getLogLevel(providedLogLevel);
}
{
logLevel = Console.getLogLevel(providedLogLevel);
}
@@
-292,19
+290,23
@@
public class Console
public static void setLogLevel(String logLevelString)
{
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);
}
}
}
}