tn5250j/src/org/tn5250j/tools/logging TN5250jLogFactory.java,1.1,1.2 Log4jLogger.java,1.2,1.3 ConsoleLogger.java,1.4,1.5 TN5250jLogger.java,1.2,1.3
Patrick Bielen <[email protected]> Mon, 05 Jul 2004 06:06:01 +0000
| Newsgroups | gmane.comp.java.tn5250j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/logging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6754/src/org/tn5250j/tools/logging
Modified Files:
TN5250jLogFactory.java Log4jLogger.java ConsoleLogger.java
TN5250jLogger.java
Log Message:
Update related to the logging-feature.
Index: TN5250jLogger.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/logging/TN5250jLogger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TN5250jLogger.java 30 Jun 2004 06:15:36 -0000 1.2
--- TN5250jLogger.java 5 Jul 2004 06:05:25 -0000 1.3
***************
*** 29,32 ****
--- 29,44 ----
public abstract class TN5250jLogger extends TN5250jLogFactory {
+ // debug levels - The levels work from lower to higher. The lower levels
+ // will be activated by turning on a higher level
+ public static final int OFF = 0;
+ public static final int DEBUG = 1;
+ public static final int INFO = 2;
+ public static final int WARN = 4;
+ public static final int ERROR = 8;
+ public static final int FATAL = 16;
+
+ // The log level at which we are now
+ protected int logLevel;
+
TN5250jLogger () {
***************
*** 49,53 ****
--- 61,72 ----
abstract public void fatal(Object message);
+ // are we enabled for X?
abstract public boolean isDebugEnabled();
+ abstract public boolean isInfoEnabled();
+
+ // level accessors
+ abstract public void setLevel(int newLevel);
+ abstract public int getLevel();
+
}
\ No newline at end of file
Index: Log4jLogger.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/logging/Log4jLogger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Log4jLogger.java 30 Jun 2004 06:15:36 -0000 1.2
--- Log4jLogger.java 5 Jul 2004 06:05:25 -0000 1.3
***************
*** 1,4 ****
/*
! * @(#)ConfigureFactory.java
* @author Kenneth J. Pouncey
* Modified by LDC Luc
--- 1,4 ----
/*
! * @(#)Log4jLogger.java
* @author Kenneth J. Pouncey
* Modified by LDC Luc
***************
*** 24,31 ****
package org.tn5250j.tools.logging;
import org.apache.log4j.Logger;
/**
! * An implementation of the TN5250jLogFactory to provide logger instances.
*/
public class Log4jLogger extends TN5250jLogger {
--- 24,32 ----
package org.tn5250j.tools.logging;
+ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
/**
! * An implementation of the TN5250jLogger to provide log4j logger instances.
*/
public class Log4jLogger extends TN5250jLogger {
***************
*** 73,75 ****
--- 74,135 ----
}
+ public boolean isInfoEnabled() {
+ return log.isInfoEnabled();
+ }
+
+ public void setLevel(int newLevel) {
+
+ switch (newLevel) {
+ case OFF:
+ Level.toLevel(Level.OFF_INT);
+ break;
+
+ case DEBUG:
+ log.getLevel().toLevel(org.apache.log4j.Level.DEBUG_INT);
+ break;
+
+ case INFO:
+ log.getLevel().toLevel(org.apache.log4j.Level.INFO_INT);
+ break;
+
+ case WARN:
+ log.getLevel().toLevel(org.apache.log4j.Level.WARN_INT);
+ break;
+
+ case ERROR:
+ log.getLevel().toLevel(org.apache.log4j.Level.ERROR_INT);
+ break;
+
+ case FATAL:
+ log.getLevel().toLevel(org.apache.log4j.Level.FATAL_INT);
+ break;
+
+ }
+
+ }
+
+ public int getLevel() {
+
+ switch (log.getLevel().toInt()) {
+
+ case (org.apache.log4j.Level.DEBUG_INT):
+ return DEBUG;
+
+ case (org.apache.log4j.Level.INFO_INT):
+ return INFO;
+
+ case (org.apache.log4j.Level.WARN_INT):
+ return WARN;
+
+ case (org.apache.log4j.Level.ERROR_INT):
+ return ERROR;
+
+ case (org.apache.log4j.Level.FATAL_INT):
+ return FATAL;
+ default:
+ return WARN;
+
+ }
+
+ }
}
\ No newline at end of file
Index: TN5250jLogFactory.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/logging/TN5250jLogFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TN5250jLogFactory.java 30 Jun 2004 04:38:29 -0000 1.1
--- TN5250jLogFactory.java 5 Jul 2004 06:05:25 -0000 1.2
***************
*** 114,117 ****
--- 114,121 ----
return logger;
}
+
+ public static boolean isLog4j() {
+ return log4j;
+ }
}
\ No newline at end of file
Index: ConsoleLogger.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/logging/ConsoleLogger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConsoleLogger.java 30 Jun 2004 06:29:52 -0000 1.4
--- ConsoleLogger.java 5 Jul 2004 06:05:25 -0000 1.5
***************
*** 1,4 ****
/*
! * @(#)ConfigureFactory.java
* @author Kenneth J. Pouncey
* Modified by LDC Luc
--- 1,4 ----
/*
! * @(#)ConsoleLogger.java
* @author Kenneth J. Pouncey
* Modified by LDC Luc
***************
*** 24,29 ****
package org.tn5250j.tools.logging;
/**
! * An implementation of the TN5250jLogFactory to provide logger instances.
*/
public class ConsoleLogger extends TN5250jLogger {
--- 24,32 ----
package org.tn5250j.tools.logging;
+ import org.tn5250j.interfaces.ConfigureFactory;
+
/**
! * An implementation of the TN5250jLogger to provide logger instances to the
! * console - System.out or System.err.
*/
public class ConsoleLogger extends TN5250jLogger {
***************
*** 37,40 ****
--- 40,46 ----
public void initialize(final String clazz) {
this.clazz = clazz;
+ logLevel = Integer.parseInt(ConfigureFactory.getInstance().getProperty(
+ "emulator.logLevel", INFO + ""));
+
}
***************
*** 46,49 ****
--- 52,56 ----
public void info(Object message) {
+ if (logLevel <= INFO)
System.out.println("INFO ["+clazz+"] "+ message);
***************
*** 51,54 ****
--- 58,62 ----
public void warn(Object message) {
+ if (logLevel <= WARN)
System.out.println("WARN ["+clazz+"] "+ message);
***************
*** 56,59 ****
--- 64,68 ----
public void warn(Object message, Throwable obj1) {
+ if (logLevel <= WARN)
System.out.println("WARN ["+clazz+"] "+ new StringBuffer(32).append(message)
.append(obj1.getMessage()));
***************
*** 61,64 ****
--- 70,74 ----
public void error(Object message) {
+ if (logLevel <= ERROR)
System.err.println("ERROR ["+clazz+"] "+ message);
***************
*** 66,69 ****
--- 76,80 ----
public void fatal(Object message) {
+ if (logLevel <= FATAL)
System.err.println("FATAL ["+clazz+"] "+ message);
***************
*** 71,76 ****
--- 82,105 ----
public boolean isDebugEnabled() {
+ if (logLevel <= DEBUG)
+ return true;
+ else
+ return false;
+ }
+
+ public boolean isInfoEnabled() {
+ if (logLevel <= INFO)
+ return true;
+ else
return false;
}
+ public void setLevel(int newLevel) {
+ logLevel = newLevel;
+ }
+
+ public int getLevel() {
+ return logLevel;
+ }
+
}
\ No newline at end of file
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com