This set of patches adjusts what messages belong at DEBUG level, and what
belong at INFO (or other) level.  Basically, a "trace" message goes to DEBUG
level, especially if it provides no useful information out of context.

On the other hand, the MailetContext.log(String, Exception) method was
changed to use WARN level, since Mailet exceptions should be logged even if
DEBUG or INFO is turned off.

I modified the .info() level connection close notification in pop3server to
log WHICH connection is closing, and whom had been the serviced user (if
any).
Index: src/java/org/apache/james/James.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.33
diff -u -r1.33 James.java
--- src/java/org/apache/james/James.java        29 Sep 2002 00:11:13 -0000      1.33
+++ src/java/org/apache/james/James.java        30 Sep 2002 17:54:23 -0000
@@ -472,13 +472,13 @@
             }
             throw new MessagingException("Exception spooling message: " + 
e.getMessage(), e);
         }
-        if (getLogger().isInfoEnabled()) {
+        if (getLogger().isDebugEnabled()) {
             StringBuffer logBuffer =
                 new StringBuffer(64)
                         .append("Mail ")
                         .append(mailimpl.getName())
                         .append(" pushed in spool");
-            getLogger().info(logBuffer.toString());
+            getLogger().debug(logBuffer.toString());
         }
     }
 
@@ -833,7 +833,7 @@
     public void log(String message, Throwable t) {
         //System.err.println(message);
         //t.printStackTrace(); //DEBUG
-        getMailetLogger().info(message,t);
+        getMailetLogger().warn(message,t);
     }
 
     /**
Index: src/java/org/apache/james/pop3server/POP3Handler.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.12
diff -u -r1.12 POP3Handler.java
--- src/java/org/apache/james/pop3server/POP3Handler.java       14 Sep 2002 07:28:55 
-0000      1.12
+++ src/java/org/apache/james/pop3server/POP3Handler.java       30 Sep 2002 17:54:24 
+-0000
@@ -207,7 +207,19 @@
                 scheduler.resetTrigger(this.toString());
             }
             scheduler.removeTrigger(this.toString());
-            getLogger().info("Connection closed");
+
+            if (getLogger().isInfoEnabled()) {
+                StringBuffer logBuffer =
+                                        new StringBuffer(128)
+                                        .append("Connection for ")
+                                        .append(user)
+                                        .append(" from ")
+                                        .append(remoteHost)
+                                        .append(" (")
+                                        .append(remoteIP)
+                                        .append(") closed.");
+                getLogger().info(logBuffer.toString());
+            }
         } catch (Exception e) {
             out.println(ERR_RESPONSE + " Error closing connection.");
             out.flush();
Index: src/java/org/apache/james/transport/JamesSpoolManager.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.18
diff -u -r1.18 JamesSpoolManager.java
--- src/java/org/apache/james/transport/JamesSpoolManager.java  30 Sep 2002 02:21:55 
-0000      1.18
+++ src/java/org/apache/james/transport/JamesSpoolManager.java  30 Sep 2002 17:54:24 
+-0000
@@ -299,9 +299,9 @@
      * them as necessary
      */
     public void run() {
+        boolean debugEnabled = getLogger().isDebugEnabled();
 
-        boolean infoEnabled = getLogger().isInfoEnabled();
-        if (infoEnabled)
+        if (getLogger().isInfoEnabled())
         {
             getLogger().info("run JamesSpoolManager: "
                              + Thread.currentThread().getName());
@@ -318,13 +318,13 @@
                 if (mail == null) {
                     continue;
                 }
-                if (infoEnabled) {
+                if (debugEnabled) {
                     StringBuffer infoBuffer =
                         new StringBuffer(64)
                                 .append("==== Begin processing mail ")
                                 .append(mail.getName())
                                 .append("====");
-                    getLogger().info(infoBuffer.toString());
+                    getLogger().debug(infoBuffer.toString());
                 }
                 process(mail);
                 // Only remove an email from the spool is processing is
@@ -333,13 +333,13 @@
                     (mail.getRecipients() == null) ||
                     (mail.getRecipients().size() == 0)) {
                     spool.remove(key);
-                    if (infoEnabled) {
+                    if (debugEnabled) {
                         StringBuffer infoBuffer =
                             new StringBuffer(64)
                                     .append("==== Removed from spool mail ")
                                     .append(mail.getName())
                                     .append("====");
-                        getLogger().info(infoBuffer.toString());
+                        getLogger().debug(infoBuffer.toString());
                     }
                 }
                 else {
@@ -380,14 +380,14 @@
                                               + processorName);
                 }
                 StringBuffer logMessageBuffer = null;
-                if (getLogger().isInfoEnabled()) {
+                if (getLogger().isDebugEnabled()) {
                     logMessageBuffer =
                         new StringBuffer(64)
                                 .append("Processing ")
                                 .append(mail.getName())
                                 .append(" through ")
                                 .append(processorName);
-                    getLogger().info(logMessageBuffer.toString());
+                    getLogger().debug(logMessageBuffer.toString());
                 }
                 processor.service(mail);
                 return;
@@ -417,8 +417,8 @@
                         .append(mail.getName())
                         .append(" through ")
                         .append(processorName);
-            getLogger().info(logMessageBuffer.toString());
-            getLogger().info("Result was " + mail.getState());
+            getLogger().error(logMessageBuffer.toString());
+            getLogger().error("Result was " + mail.getState());
         }
     }
 

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to