Changeset 5116 in subversion

Timestamp:

Aug 24, 2011 3:31:40 AM (21 months ago)

Author:

alec

Message:

• Added unique connection identifier to IMAP debug messages

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap_generic.php (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added unique connection identifier to IMAP debug messages
 - Added 'priority' column on messages list (#1486782)
 - Fix image type check for contact photo uploads

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -106 +106 @@
     private $cmd_tag;
     private $cmd_num = 0;
+    private $resourceid;
     private $_debug = false;
     private $_debug_handler = false;
@@ -735 +736 @@
         $line = trim(fgets($this->fp, 8192));
 
-        if ($this->_debug && $line) {
-            $this->debug('S: '. $line);
+        if ($this->_debug) {
+            // set connection identifier for debug output
+            preg_match('/#([0-9]+)/', (string)$this->fp, $m);
+            $this->resourceid = strtoupper(substr(md5($m[1].$this->user.microtime()), 0, 4));
+
+            if ($line)
+                $this->debug('S: '. $line);
         }
 
@@ -3362 +3368 @@
     private function debug($message)
     {
+        if ($this->resourceid) {
+            $message = sprintf('[%s] %s', $this->resourceid, $message);
+        }
+
         if ($this->_debug_handler) {
             call_user_func_array($this->_debug_handler, array(&$this, $message));