Added default log level for Logger.

The Logger class has been modified to provide a way to specify
the default log level.

https://pagure.io/dogtagpki/issue/2689

Change-Id: Iaab5d95b7dfa1bfa814c7270259e01e019a33678

1 files changed, 37 insertions, 12 deletions

diff --git a/base/server/cms/src/com/netscape/cms/logging/Logger.java b/base/server/cms/src/com/netscape/cms/logging/Logger.java
index ccba6e2a9..0b33a3967 100644
--- a/base/server/cms/src/com/netscape/cms/logging/Logger.java
+++ b/base/server/cms/src/com/netscape/cms/logging/Logger.java
@@ -50,6 +50,7 @@ public class Logger implements ILogger {
     LogFactory factory;
     LogCategory category;
     LogSource source;
+    int level = ILogger.LL_INFO;
 
     public Logger() {
     }
@@ -60,6 +61,13 @@ public class Logger implements ILogger {
         this.source = source;
     }
 
+    public Logger(LogFactory factory, LogCategory category, LogSource source, int level) {
+        this.factory = factory;
+        this.category = category;
+        this.source = source;
+        this.level = level;
+    }
+
     /**
      * get default single global logger
      */
@@ -96,19 +104,24 @@ public class Logger implements ILogger {
     }
 
     //************** default level ****************
+
+    public void log(String msg) {
+        log(category, null, source, level, msg, null);
+    }
+
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param source the source of the log event
      * @param msg the one line detail message to be logged
      */
     public void log(LogCategory evtClass, LogSource source, String msg) {
-        log(evtClass, null, source, ILogger.LL_INFO, msg, null);
+        log(evtClass, null, source, level, msg, null);
     }
 
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param props the resource bundle used for the detailed message
@@ -116,7 +129,7 @@ public class Logger implements ILogger {
      * @param msg the one line detail message to be logged
      */
     public void log(LogCategory evtClass, Properties props, LogSource source, String msg) {
-        log(evtClass, props, source, ILogger.LL_INFO, msg, null);
+        log(evtClass, props, source, level, msg, null);
     }
 
     //************** no param ****************
@@ -166,7 +179,7 @@ public class Logger implements ILogger {
     }
 
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param props the resource bundle used for the detailed message
@@ -175,7 +188,7 @@ public class Logger implements ILogger {
      * @param param the parameter in the detail message
      */
     public void log(LogCategory evtClass, Properties props, LogSource source, String msg, Object param) {
-        log(evtClass, props, source, ILogger.LL_INFO, msg, param);
+        log(evtClass, props, source, level, msg, param);
     }
 
     /**
@@ -198,6 +211,10 @@ public class Logger implements ILogger {
 
     //******************* multiple param **************************
 
+    public void log(int level, String msg, Object params[]) {
+        log(category, null, source, level, msg, params);
+    }
+
     /**
      * Logs an event to the log queue.
      *
@@ -233,7 +250,7 @@ public class Logger implements ILogger {
     //******************** multiline log *************************
     //************** default level ****************
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param source the source of the log event
@@ -241,11 +258,11 @@ public class Logger implements ILogger {
      * @param multiline true if the message has more than one line, otherwise false
      */
     public void log(LogCategory evtClass, LogSource source, String msg, boolean multiline) {
-        log(evtClass, null, source, ILogger.LL_INFO, msg, null, multiline);
+        log(evtClass, null, source, level, msg, null, multiline);
     }
 
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param props the resource bundle used for the detailed message
@@ -254,11 +271,15 @@ public class Logger implements ILogger {
      * @param multiline true if the message has more than one line, otherwise false
      */
     public void log(LogCategory evtClass, Properties props, LogSource source, String msg, boolean multiline) {
-        log(evtClass, props, source, ILogger.LL_INFO, msg, null, multiline);
+        log(evtClass, props, source, level, msg, null, multiline);
     }
 
     //************** no param ****************
 
+    public void log(int level, String msg, boolean multiline) {
+        log(category, null, source, level, msg, multiline);
+    }
+
     /**
      * Logs an event to the log queue.
      *
@@ -303,7 +324,7 @@ public class Logger implements ILogger {
     }
 
     /**
-     * Logs an event using default log level: ILogger.LL_INFO
+     * Logs an event using default log level.
      *
      * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM.
      * @param props the resource bundle used for the detailed message
@@ -313,7 +334,7 @@ public class Logger implements ILogger {
      * @param multiline true if the message has more than one line, otherwise false
      */
     public void log(LogCategory evtClass, Properties props, LogSource source, String msg, Object param, boolean multiline) {
-        log(evtClass, props, source, ILogger.LL_INFO, msg, param, multiline);
+        log(evtClass, props, source, level, msg, param, multiline);
     }
 
     /**
@@ -337,6 +358,10 @@ public class Logger implements ILogger {
 
     //******************* multiple param **************************
 
+    public void log(int level, String msg, Object params[], boolean multiline) {
+        log(category, null, source, level, msg, params, multiline);
+    }
+
     /**
      * Logs an event to the log queue.
      *