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

Timestamp:

07/18/07 08:25:45 PM (18 months ago)

Author:

octorian

Message:

Initial logging code (#30)

Files:

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

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

@@ -43 +43 @@
  * receiving Internet mail messages using the SMTP and POP3 protocols.
  *
- * Copyright (c) 2000-2002 Jrg Pleumann <joerg@pleumann.de>
+ * Copyright (c) 2000-2002 Jorg Pleumann <joerg@pleumann.de>
  *
  * Mail4ME is part of the EnhydraME family of projects. See the following web
@@ -67 +67 @@
 import javax.microedition.io.StreamConnection;
 import javax.microedition.io.Connector;
+import net.rim.device.api.system.EventLogger;
+import org.logicprobe.LogicMail.AppInfo;
 
 /**
@@ -102 +104 @@
     
     /**
-     * If true, protocol debugging information is written to standard output.
-     */
-    private boolean debug;
-    
-    /**
      * Provides a buffer used for incoming data.
      */
@@ -126 +123 @@
         this.useSSL = useSSL;
         this.deviceSide = deviceSide;
-        this.debug = false;
         this.input = null;
         this.output = null;
@@ -136 +132 @@
      */
     public void open() throws IOException {
-        close();
+        if(input != null || output != null || socket != null) {
+            close();
+        }
 
         synchronized(openConnections) {
@@ -150 +148 @@
         String connectStr = protocolStr + "://" + serverName +
                 ":" + serverPort + paramStr;
-        if (debug) {
-            System.out.println("[OPEN] " + connectStr);
-        }
+        
+        if(EventLogger.getMinimumLevel() >= EventLogger.DEBUG_INFO) {
+            String msg = "Opening connection:\r\n"+connectStr+"\r\n";
+            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(), EventLogger.DEBUG_INFO);
+        }
+        
         socket = (StreamConnection)Connector.open(connectStr, Connector.READ_WRITE, true);
         input = socket.openDataInputStream();
         output = socket.openDataOutputStream();
         localAddress = ((SocketConnection)socket).getLocalAddress();
+
+        if(EventLogger.getMinimumLevel() >= EventLogger.DEBUG_INFO) {
+            String msg =
+                "Connection established:\r\n"+
+                "Input: "+input.getClass().toString()+"\r\n"+
+                "Output: "+input.getClass().toString()+"\r\n"+
+                "Local address: "+localAddress+"\r\n";
+            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(), EventLogger.DEBUG_INFO);
+        }
     }
     
@@ -181 +191 @@
             }
         }
+        
+        EventLogger.logEvent(AppInfo.GUID, "Connection closed".getBytes(), EventLogger.DEBUG_INFO);
     }
     
@@ -255 +267 @@
          */
         if (s.length() == 0) {
-            if (debug) {
-                System.out.println("[SEND]");
-            }
+            EventLogger.logEvent(AppInfo.GUID, "[SEND]".getBytes(), EventLogger.DEBUG_INFO);
             
             output.write(CRLF, 0, 2);
@@ -277 +287 @@
                 }
                 
-                if (debug) {
-                    System.out.println("[SEND] " + s.substring(i, j));
-                }
+                EventLogger.logEvent(AppInfo.GUID, ("[SEND] " + s.substring(i, j)).getBytes(), EventLogger.DEBUG_INFO);
                 
                 /**
@@ -297 +305 @@
             }
         }
-        output.flush(); // I can't believe this wasn't here before (DK)
+        output.flush();
     }
     
@@ -312 +320 @@
         int length = bytes.length;
         
-        if (debug) {
-            System.out.println("[SEND] " + s);
-        }
+        EventLogger.logEvent(AppInfo.GUID, ("[SEND RAW]\r\n" + s).getBytes(), EventLogger.DEBUG_INFO);
 
         output.write(bytes, 0, bytes.length);
@@ -386 +392 @@
                     try {
                         close();
-                    } catch (IOException ignored) {
-                    }
+                    } catch (IOException e) { }
                     
                     throw new IOException("Connection closed");
@@ -399 +404 @@
                     try {
                         Thread.yield();
-                    } catch (Exception ignored) {
-                    }
+                    } catch (Exception e) { }
                 }
                 
@@ -439 +443 @@
         }
         
-        if (debug) {
-            System.out.println("[RECV] " + resultBuffer.toString());
-        }
+        EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
         
         return resultBuffer.toString();
     }
-    
-    /**
-     * Controls the output of debugging information to standard output. Set it to
-     * true to see all protocol information exchanged.
-     *
-     * @see #getDebug
-     */
-    public void setDebug(boolean debug) {
-        this.debug = debug;
-    }
-    
-    /**
-     * Queries the current value of the debugging flag.
-     *
-     * @see #setDebug
-     */
-    public boolean getDebug() {
-        return debug;
-    }
 }