Changeset 136 for trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

Timestamp:

07/28/07 05:44:23 PM (18 months ago)

Author:

octorian

Message:

More logging code

Files:

• trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java (modified) (8 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

@@ -69 +69 @@
 import net.rim.device.api.system.EventLogger;
 import org.logicprobe.LogicMail.AppInfo;
+import org.logicprobe.LogicMail.conf.GlobalConfig;
+import org.logicprobe.LogicMail.conf.MailSettings;
 
 /**
@@ -95 +97 @@
     private StreamConnection socket;
     private String localAddress;
+    private GlobalConfig globalConfig;
     protected InputStream input;
     protected OutputStream output;
@@ -126 +129 @@
         this.output = null;
         this.socket = null;
+        this.globalConfig = MailSettings.getInstance().getGlobalConfig();
     }
     
@@ -266 +270 @@
          */
         if (s.length() == 0) {
-            EventLogger.logEvent(AppInfo.GUID, "[SEND]".getBytes(), EventLogger.DEBUG_INFO);
+            if(globalConfig.getConnDebug()) {
+                EventLogger.logEvent(AppInfo.GUID, "[SEND]".getBytes(), EventLogger.DEBUG_INFO);
+            }
             
             output.write(CRLF, 0, 2);
@@ -286 +292 @@
                 }
                 
-                EventLogger.logEvent(AppInfo.GUID, ("[SEND] " + s.substring(i, j)).getBytes(), EventLogger.DEBUG_INFO);
+                if(globalConfig.getConnDebug()) {
+                    EventLogger.logEvent(AppInfo.GUID, ("[SEND] " + s.substring(i, j)).getBytes(), EventLogger.DEBUG_INFO);
+                }
                 
                 /**
@@ -319 +327 @@
         int length = bytes.length;
         
-        EventLogger.logEvent(AppInfo.GUID, ("[SEND RAW]\r\n" + s).getBytes(), EventLogger.DEBUG_INFO);
-
+        if(globalConfig.getConnDebug()) {
+            EventLogger.logEvent(AppInfo.GUID, ("[SEND RAW]\r\n" + s).getBytes(), EventLogger.DEBUG_INFO);
+        }
+        
         output.write(bytes, 0, bytes.length);
         
@@ -389 +399 @@
                  */
                 if (actual == -1) {
+                    EventLogger.logEvent(AppInfo.GUID, "Unable to read from socket, closing connection".getBytes(), EventLogger.INFORMATION);
                     try {
                         close();
@@ -442 +453 @@
         }
         
-        EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
+        if(globalConfig.getConnDebug()) {
+            EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
+        }
         
         return resultBuffer.toString();