lib/ext lib/kolab_sync_logger.php

Aleksander Machniak machniak at kolabsys.com
Tue Oct 8 12:55:41 CEST 2013


 lib/ext/Syncroton/Server.php |    6 +++---
 lib/kolab_sync_logger.php    |   17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 9f05ae2b226b1751921f4af96f7d59507191f8b9
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Oct 8 12:54:20 2013 +0200

    Fixed issue where debug messages were sent to errors file

diff --git a/lib/ext/Syncroton/Server.php b/lib/ext/Syncroton/Server.php
index 114db4d..bbcfc3d 100644
--- a/lib/ext/Syncroton/Server.php
+++ b/lib/ext/Syncroton/Server.php
@@ -246,9 +246,9 @@ class Syncroton_Server
      * @param unknown     $priority
      * @param DOMDocument $dom
      * @param string      $method
-     * @param string      $method
+     * @param int         $line
      */
-    protected function _logDomDocument($priority, DOMDocument $dom, $method, $method)
+    protected function _logDomDocument($priority, DOMDocument $dom, $method, $line)
     {
         $loops = 0;
         
@@ -262,7 +262,7 @@ class Syncroton_Server
         
         // log data in 1MByte chunks
         while (!feof($tempStream)) {
-            $this->_logger->log($method . '::' . $method . " xml response($loops):\n" . fread($tempStream, 1048576), $priority);
+            $this->_logger->log($method . '::' . $line . " xml response($loops):\n" . fread($tempStream, 1048576), $priority);
             
             $loops++;
         }
diff --git a/lib/kolab_sync_logger.php b/lib/kolab_sync_logger.php
index 2807cad..7f1b664 100644
--- a/lib/kolab_sync_logger.php
+++ b/lib/kolab_sync_logger.php
@@ -51,8 +51,8 @@ class kolab_sync_logger extends Zend_Log
     /**
      * Message logger
      *
-     * @param string $message Log message
-     * @param int    $mode    Message severity
+     * @param string     $message Log message
+     * @param int|string $method  Message severity
      */
     public function log($message, $method)
     {
@@ -60,7 +60,18 @@ class kolab_sync_logger extends Zend_Log
         $logfile = $rcube->config->get('activesync_log_file');
         $format  = $rcube->config->get('log_date_format', 'd-M-Y H:i:s O');
         $log_dir = $rcube->config->get('log_dir');
-        $mode    = $this->_priorities[$method];
+
+        if (is_numeric($method)) {
+            $mode   = $method;
+            $method = array_search($method, $this->_priorities);
+        }
+        else {
+            $mode = $this->_priorities[$method];
+        }
+
+        if ($mode > self::$mode) {
+            return;
+        }
 
         // if log_file is configured all logs will go to it
         // otherwise use separate file for info/debug and warning/error




More information about the commits mailing list