rwaldhoff 01/08/08 14:51:29
Modified: httpclient/src/java/org/apache/commons/httpclient/log
Log.java Log4JCategoryLog.java NoOpLog.java
SimpleLog.java
Log:
adding support for changing Log levels (log4j Priorities) on the fly
Revision Changes Path
1.4 +17 -1
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log.java
Index: Log.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Log.java 2001/08/07 17:37:22 1.3
+++ Log.java 2001/08/08 21:51:29 1.4
@@ -11,7 +11,7 @@
/**
* A simple logging interface abstracting log4j.
* @author Rod Waldhoff
- * @version $Id: Log.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $
+ * @version $Id: Log.java,v 1.4 2001/08/08 21:51:29 rwaldhoff Exp $
*/
public interface Log {
public void debug(Object message);
@@ -26,4 +26,20 @@
public void fatal(Object message, Throwable t);
public boolean isDebugEnabled();
public boolean isInfoEnabled();
+ public void setLevel(int level);
+
+ /** All logging level. */
+ public static final int ALL = Integer.MIN_VALUE;
+ /** "Debug" level logging. */
+ public static final int DEBUG = 10000;
+ /** "Info" level logging. */
+ public static final int INFO = 20000;
+ /** "Warn" level logging. */
+ public static final int WARN = 30000;
+ /** "Error" level logging. */
+ public static final int ERROR = 40000;
+ /** "Fatal" level logging. */
+ public static final int FATAL = 50000;
+ /** No logging level. */
+ public static final int OFF = Integer.MAX_VALUE;
}
1.4 +24 -1
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log4JCategoryLog.java
Index: Log4JCategoryLog.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/Log4JCategoryLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Log4JCategoryLog.java 2001/08/07 17:37:22 1.3
+++ Log4JCategoryLog.java 2001/08/08 21:51:29 1.4
@@ -13,7 +13,7 @@
/**
* @author Rod Waldhoff
- * @version $Id: Log4JCategoryLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $
+ * @version $Id: Log4JCategoryLog.java,v 1.4 2001/08/08 21:51:29 rwaldhoff Exp $
*/
public class Log4JCategoryLog implements Log {
Category _category = null;
@@ -71,5 +71,28 @@
public final boolean isEnabledFor(Priority p) {
return _category.isEnabledFor(p);
+ }
+
+ public final void setLevel(int level) {
+ switch(level) {
+ case Log.DEBUG:
+ _category.setPriority(Priority.DEBUG);
+ break;
+ case Log.INFO:
+ _category.setPriority(Priority.INFO);
+ break;
+ case Log.WARN:
+ _category.setPriority(Priority.WARN);
+ break;
+ case Log.ERROR:
+ _category.setPriority(Priority.ERROR);
+ break;
+ case Log.FATAL:
+ _category.setPriority(Priority.FATAL);
+ break;
+ default:
+ _category.setPriority(Priority.toPriority(level));
+ break;
+ }
}
}
1.4 +2 -1
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/NoOpLog.java
Index: NoOpLog.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/NoOpLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NoOpLog.java 2001/08/07 17:37:22 1.3
+++ NoOpLog.java 2001/08/08 21:51:29 1.4
@@ -10,7 +10,7 @@
/**
* @author Rod Waldhoff
- * @version $Id: NoOpLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $
+ * @version $Id: NoOpLog.java,v 1.4 2001/08/08 21:51:29 rwaldhoff Exp $
*/
public final class NoOpLog implements Log {
public NoOpLog() { }
@@ -27,4 +27,5 @@
public void fatal(Object message, Throwable t) { }
public final boolean isDebugEnabled() { return false; }
public final boolean isInfoEnabled() { return false; }
+ public final void setLevel(int level) { }
}
1.4 +19 -20
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/SimpleLog.java
Index: SimpleLog.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/log/SimpleLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleLog.java 2001/08/07 17:37:22 1.3
+++ SimpleLog.java 2001/08/08 21:51:29 1.4
@@ -17,7 +17,7 @@
/**
* @author Rod Waldhoff
- * @version $Id: SimpleLog.java,v 1.3 2001/08/07 17:37:22 rwaldhoff Exp $
+ * @version $Id: SimpleLog.java,v 1.4 2001/08/08 21:51:29 rwaldhoff Exp $
*/
public class SimpleLog implements Log {
static protected final Properties _simplelogProps = new Properties();
@@ -56,12 +56,7 @@
}
}
- protected static final int DEBUG = 5;
- protected static final int INFO = 4;
- protected static final int WARN = 3;
- protected static final int ERROR = 2;
- protected static final int FATAL = 1;
- protected int _logLevel = 2;
+ protected int _logLevel = Log.ERROR;
protected String _name = null;
@@ -93,7 +88,7 @@
}
protected void log(int type, Object message, Throwable t) {
- if(_logLevel >= type) {
+ if(_logLevel <= type) {
StringBuffer buf = new StringBuffer();
if(_showtime) {
buf.append(_df.format(new Date()));
@@ -121,49 +116,53 @@
}
public final void debug(Object message) {
- log(DEBUG,message,null);
+ log(Log.DEBUG,message,null);
}
public final void debug(Object message, Throwable t) {
- log(DEBUG,message,t);
+ log(Log.DEBUG,message,t);
}
public final void info(Object message) {
- log(INFO,message,null);
+ log(Log.INFO,message,null);
}
public final void info(Object message, Throwable t) {
- log(INFO,message,t);
+ log(Log.INFO,message,t);
}
public final void warn(Object message) {
- log(WARN,message,null);
+ log(Log.WARN,message,null);
}
public final void warn(Object message, Throwable t) {
- log(WARN,message,t);
+ log(Log.WARN,message,t);
}
public final void error(Object message) {
- log(ERROR,message,null);
+ log(Log.ERROR,message,null);
}
public final void error(Object message, Throwable t) {
- log(ERROR,message,t);
+ log(Log.ERROR,message,t);
}
public final void fatal(Object message) {
- log(FATAL,message,null);
+ log(Log.FATAL,message,null);
}
public final void fatal(Object message, Throwable t) {
- log(FATAL,message,t);
+ log(Log.FATAL,message,t);
}
public final boolean isDebugEnabled() {
- return (_logLevel >= DEBUG);
+ return (_logLevel <= DEBUG);
}
public final boolean isInfoEnabled() {
- return (_logLevel >= INFO);
+ return (_logLevel <= INFO);
+ }
+
+ public final void setLevel(int level) {
+ _logLevel = level;
}
}
