From 19315f8f48012ede41c325d72526a612002737f8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 24 Mar 2015 03:45:21 +0100
Subject: Fix Logging: PlainLogConsoleHandler shall start w/ Level.ALL, add
explicit Level setter for handler.
---
src/java/com/jogamp/gluegen/Logging.java | 33 +++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
(limited to 'src/java/com/jogamp')
diff --git a/src/java/com/jogamp/gluegen/Logging.java b/src/java/com/jogamp/gluegen/Logging.java
index ddefca4..c057db4 100644
--- a/src/java/com/jogamp/gluegen/Logging.java
+++ b/src/java/com/jogamp/gluegen/Logging.java
@@ -40,6 +40,8 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import jogamp.common.Debug;
+
import com.jogamp.common.util.PropertyAccess;
import com.jogamp.gluegen.cgram.types.AliasedSymbol;
import com.jogamp.gluegen.cgram.types.Type;
@@ -49,6 +51,8 @@ import com.jogamp.gluegen.cgram.types.Type;
* @author Michael Bien, et.al.
*/
public class Logging {
+ public static final boolean DEBUG = Debug.debug("Logging");
+
/**
* An interface for {@link Logger}.
*/
@@ -110,6 +114,10 @@ public class Logging {
* See {@link Logger#setLevel(Level)}
*/
void setLevel(final Level newLevel) throws SecurityException;
+ /**
+ * See {@link Handler#setLevel(Level)}
+ */
+ void setLevelOfAllHandler(final Level newLevel) throws SecurityException;
/**
* See {@link Logger#getLevel()}
*/
@@ -136,7 +144,7 @@ public class Logging {
public final PlainLogConsoleHandler handler;
/* pp */ FQNLogger(final String fqnClassName, final String simpleClassName, final Level level) {
this.impl = Logger.getLogger(fqnClassName);
- this.handler = new PlainLogConsoleHandler(new PlainLogFormatter(simpleClassName), level);
+ this.handler = new PlainLogConsoleHandler(new PlainLogFormatter(simpleClassName), Level.ALL);
this.impl.setUseParentHandlers(false);
this.impl.setLevel(level);
this.impl.addHandler(this.handler);
@@ -226,6 +234,13 @@ public class Logging {
impl.setLevel(newLevel);
}
@Override
+ public void setLevelOfAllHandler(final Level newLevel) throws SecurityException {
+ final Handler[] hs = getHandlers();
+ for(final Handler h:hs) {
+ h.setLevel(newLevel);
+ }
+ }
+ @Override
public Level getLevel() {
return impl.getLevel();
}
@@ -303,7 +318,11 @@ public class Logging {
if(property != null) {
level = Level.parse(property);
} else {
- level = Level.WARNING;
+ if( DEBUG || GlueGen.debug() ) {
+ level = Level.ALL;
+ } else {
+ level = Level.WARNING;
+ }
}
final String simpleClassName = Logging.class.getSimpleName();
final String fqnClassName = packageName+"."+simpleClassName;
@@ -353,11 +372,11 @@ public class Logging {
}
/** Align log-level of given logger to the root logger's level. */
public static void alignLevel(final LoggerIf l) {
- final Level level = rootPackageLogger.getLevel();
+ alignLevel(l, rootPackageLogger.getLevel());
+ }
+ /** Align log-level of given logger and all its handlers to the given level. */
+ public static void alignLevel(final LoggerIf l, final Level level) {
l.setLevel(level);
- final Handler[] hs = l.getHandlers();
- for(final Handler h:hs) {
- h.setLevel(level);
- }
+ l.setLevelOfAllHandler(level);
}
}
--
cgit v1.2.3