Request 3184 (accepted)

This request supersedes: request 3182 (Show diff)

Overview

Request 3184 (accepted)

New release

Created by mollekopf 10 months ago
In state accepted
Supersedes 3182
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Backend/ABackend.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Command/FolderCreate.php Changed

@@ -98,16 +98,31 @@
                 $this->_folder->deviceId     = $this->_device;
                 $this->_folder->creationTime = $this->_syncTimeStamp;
 
-                $this->_folderBackend->create($this->_folder);
+                // Check if the folder already exists to avoid a duplicate insert attempt in db
+                try {
+                    $this->_folderBackend->getFolder($this->_device, $this->_folder->serverId);
+
+                    if ($this->_logger instanceof Zend_Log)
+                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " Attempted to create a folder that already exists. parentId: {$folder->parentId} displayName: {$folder->displayName}");
+
+                    // The folder already exists
+                    $this->_status = Syncroton_Command_FolderSync::STATUS_FOLDER_EXISTS;
+                } catch (Syncroton_Exception_NotFound $e) {
+                    // This is the normal case
+                    if ($this->_logger instanceof Zend_Log)
+                        $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+
+                    $this->_folderBackend->create($this->_folder);
+                }
             }
         } catch (Syncroton_Exception_Status $e) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
 
             $this->_status = $e->getCode();
         } catch (Exception $e) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
 
             $this->_status = Syncroton_Command_FolderSync::STATUS_UNKNOWN_ERROR;
         }

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Command/ItemOperations.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Command/Ping.php Changed

@@ -90,7 +90,7 @@
             }
         }
         
-        $this->_device->lastping = new DateTime('now', new DateTimeZone('utc'));
+        $this->_device->lastping = new DateTime('now', new DateTimeZone('UTC'));
 
         if ($status == self::STATUS_NO_CHANGES_FOUND) {
             $this->_device = $this->_deviceBackend->update($this->_device);
@@ -113,7 +113,7 @@
         $intervalEnd = $intervalStart + $lifeTime;
         $secondsLeft = $intervalEnd;
         
-        $folders = unserialize($this->_device->pingfolder);
+        $folders = $this->_device->pingfolder ? unserialize($this->_device->pingfolder) : array();
         
         if ($status === self::STATUS_NO_CHANGES_FOUND && (!is_array($folders) || count($folders) == 0)) {
             $status = self::STATUS_MISSING_PARAMETERS;
@@ -185,7 +185,7 @@
                     continue;
                 }
 
-                $now = new DateTime('now', new DateTimeZone('utc'));
+                $now = new DateTime('now', new DateTimeZone('UTC'));
                 
                 foreach ($folders as $folderId) {
                     try {

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Command/Search.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Model/AXMLEntry.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Model/StoreRequest.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/ext/Syncroton/Server.php Changed

@@ -105,9 +105,9 @@
         
         $className = 'Syncroton_Command_' . $requestParameters'command';
         
-        if(!class_exists($className)) {
+        if (!class_exists($className)) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " command not supported: " . $requestParameters'command');
+                $this->_logger->notice(__METHOD__ . '::' . __LINE__ . " command not supported: " . $requestParameters'command');
             
             header("HTTP/1.1 501 not implemented");
             
@@ -161,11 +161,11 @@
             
         } catch (Exception $e) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " unexpected exception occured: " . get_class($e));
+                $this->_logger->err(__METHOD__ . '::' . __LINE__ . " unexpected exception occured: " . get_class($e));
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " exception message: " . $e->getMessage());
+                $this->_logger->err(__METHOD__ . '::' . __LINE__ . " exception message: " . $e->getMessage());
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " " . $e->getTraceAsString());
+                $this->_logger->err(__METHOD__ . '::' . __LINE__ . " " . $e->getTraceAsString());
             
             header("HTTP/1.1 500 Internal server error");
             
@@ -190,7 +190,6 @@
             } catch (Syncroton_Wbxml_Exception $swe) {
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->err(__METHOD__ . '::' . __LINE__ . " Could not encode output: " . $swe);
-                    $this->_logDomDocument(Zend_Log::WARN, $response, __METHOD__, __LINE__);
                 }
                 
                 header("HTTP/1.1 500 Internal server error");
@@ -245,15 +244,13 @@
     /**
      * write (possible big) DOMDocument in smaller chunks to log file
      * 
-     * @param unknown     $priority
+     * @param int         $priority
      * @param DOMDocument $dom
      * @param string      $method
      * @param int         $line
      */
     protected function _logDomDocument($priority, DOMDocument $dom, $method, $line)
     {
-        $loops = 0;
-        
         $tempStream = tmpfile();
 
         $meta_data = stream_get_meta_data($tempStream);
@@ -265,12 +262,7 @@
         
         rewind($tempStream);
         
-        // log data in 1MByte chunks
-        while (!feof($tempStream)) {
-            $this->_logger->log($method . '::' . $line . " xml response($loops):\n" . fread($tempStream, 1048576), $priority);
-            
-            $loops++;
-        }
+        $this->_logger->log($method . '::' . $line . " xml response(first 4k):\n" . fread($tempStream, 4 * 1024), $priority);
         
         fclose($tempStream);
     }

kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync_backend.php Changed

kolab-syncroton-2.4.0.tar.gz/lib/kolab_sync_timezone_converter.php Changed

kolab-syncroton-2.4.0.tar.gz/tests/timezone_converter.php Changed

Build Results
RPM Lint

Refresh

Comments for request 3184 0

Request History

mollekopf created request 10 months ago

New release

mollekopf accepted request 10 months ago