Merge pull request #2 from dimitrytarasov/master

[Exec transport only] Divide huge log batches into chunks and send them one by one

Author: eric-martin

README.md

@@ -32,7 +32,7 @@ all transports are available for standalone logger as well.
 
 ## License
 
-Copyright 2014 Stackify, LLC.
+Copyright 2015 Stackify, LLC.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -44,4 +44,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

src/Stackify/Log/Transport/AbstractApiTransport.php

@@ -11,7 +11,7 @@ abstract class AbstractApiTransport extends AbstractTransport
 
     protected $apiKey;
     protected $proxy;
-    private $queue = array();
+    protected $queue = array();
 
     public function __construct($apiKey, array $options = array())
     {

src/Stackify/Log/Transport/ExecTransport.php

@@ -30,6 +30,19 @@ public function __construct($apiKey, array $options = array())
         }
     }
 
+    /**
+     * Overrides parent's method
+     */
+    public function finish()
+    {
+        if (!empty($this->queue)) {
+            // empty queue to avoid duplicates
+            $queue = $this->queue;
+            $this->queue = array();
+            $this->sendChunk($queue);
+        }
+    }
+
     protected function getAllowedOptions()
     {
         return array_merge(parent::getAllowedOptions(), array(
@@ -42,6 +55,27 @@ protected function getTransportName()
         return 'ExecTransport';
     }
 
+    protected function sendChunk(array $items)
+    {
+        $json = $this->messageBuilder->getApiMessage($items);
+        $jsonLength = strlen($json);
+        $count = count($items);
+        if ($jsonLength > self::MAX_POST_LENGTH) {
+            if (1 === $count) {
+                // it makes no sense to divide into chunks, just fail
+                $this->logError(self::ERROR_LENGTH, $jsonLength);
+                return;
+            }
+            $maxCount = floor($count / ceil($jsonLength / self::MAX_POST_LENGTH));
+            $chunks = array_chunk($items, $maxCount);
+            foreach ($chunks as $chunk) {
+                $this->sendChunk($chunk);
+            }
+        } else {
+            $this->send($json);
+        }
+    }
+
     protected function send($data)
     {
         $url = Api::API_BASE_URL . Api::API_CALL_LOGS;
@@ -61,11 +95,6 @@ protected function send($data)
             // return immediately while curl will run in the background
             $cmd .= ' > /dev/null 2>&1 &';
         }
-        $cmdLength = strlen($cmd);
-        if ($cmdLength > self::MAX_POST_LENGTH) {
-            $this->logError(self::ERROR_LENGTH, $cmdLength);
-            return;
-        }
         $output = array();
         $r = exec($cmd, $output, $result);
         // if debug mode is off, it makes no sense to check result,