php sdk更新

Aliyun/Log/Models/LogBatch.php

@@ -4,6 +4,11 @@
  * All rights reserved
  */
 
+/**
+ * Class Aliyun_Log_Models_LogBatch
+ * in some cases the http port is quite limited, so user could config a batch logger,
+ * which will cache some log and send to server in bulk
+ */
 class Aliyun_Log_Models_LogBatch{
 
     private $logItems = [];
@@ -16,29 +21,49 @@ class Aliyun_Log_Models_LogBatch{
 
     private $shm_id;
 
-    public function __construct($maxLogSize, Aliyun_Log_Logger $logger, $sem_id = null, $shm_id = null)
+    private $topic;
+
+    private $waitTime;
+
+    private $previousLogTime;
+
+    public function __construct(Aliyun_Log_Logger $logger, $topic, $cacheLogCount = null, $cacheLogWaitTime = null)
     {
-        $this->arraySize = $maxLogSize;
-        if(!is_integer($maxLogSize)){
-            $this->arraySize = 5;
+        if(NULL === $cacheLogCount || !is_integer($cacheLogCount)){
+            $this->arraySize = 100;
+        }else{
+            $this->arraySize = $cacheLogCount;
         }
+
+        if(NULL === $cacheLogWaitTime || !is_integer($cacheLogWaitTime)){
+            $this->waitTime = 5;
+        }else{
+            $this->waitTime = $cacheLogWaitTime;
+        }
+
         $this->logger = $logger;
-        if($sem_id == null || $shm_id == null){
-            $MEMSIZE    =   10240;
-            $SEMKEY     =   22;
-            $SHMKEY     =   33;
-
-            $this->sem_id = sem_get($SEMKEY, 1);
-            sem_acquire($this->sem_id);
-            $this->shm_id =   shm_attach($SHMKEY, $MEMSIZE);
-            if(shm_has_var($this->shm_id, 1)){
-                shm_remove_var($this->shm_id, 1);
-            }
-            shm_put_var($this->shm_id, 1, $this->logItems);
+        $this->topic = $topic;
+
+        $MEMSIZE    =   10240;
+        $SEMKEY     =   22 + time();
+        $SHMKEY     =   33 + time();
+
+        $this->sem_id = sem_get($SEMKEY, 1);
+        //sem_acquire($this->sem_id);
+        $this->shm_id =   shm_attach($SHMKEY, $MEMSIZE);
+        if(shm_has_var($this->shm_id, 1)){
+            shm_remove_var($this->shm_id, 1);
         }
+        shm_put_var($this->shm_id, 1, $this->logItems);
+
     }
 
     public function log($logMessage, $logLevel){
+        $prevoidCallTime = $this->previousLogTime;
+        if(NULL ===  $prevoidCallTime){
+            $prevoidCallTime = 0;
+        }
+        $this->previousLogTime = time();
         $contents = array( // key-value pair
             'time'=>date('m/d/Y h:i:s a', time()),
             'message'=> $logMessage,
@@ -52,8 +77,8 @@ public function log($logMessage, $logLevel){
             $logItems = shm_get_var($this->shm_id, 1);
             array_push($logItems, $logItem);
 
-            if(sizeof($logItems) == $this->arraySize){
-                $this->logger->logBatch($logItems, 'MainFlow');
+            if((sizeof($logItems) == $this->arraySize) || ($this->previousLogTime - $prevoidCallTime > 5)){
+                $this->logger->logBatch($logItems, $this->topic);
                 $logItems = [];
             }
 
@@ -63,22 +88,21 @@ public function log($logMessage, $logLevel){
         }
     }
 
-    public function shareSem($shm_id){
+    private function batchSentLog($logItems){
 
-        if(shm_has_var($shm_id, 1)){
-            $tmp = shm_get_var($shm_id, 1);
-            shm_put_var($shm_id, 1, "*,".$tmp);
-        }else{
-            shm_put_var($shm_id, 1, "Variable 1");
-        }
+    }
 
-        $result = shm_get_var($shm_id, 1);
-        echo $result."<br>";
+    public function logFlush(){
+        if(sizeof($this->logItems) > 0){
+            $this->logger->logBatch($this->logItems, $this->topic);
+            $this->logItems = [];
+        }
+        shm_remove_var($this->shm_id, 1);
     }
 
     function __destruct() {
         if(sizeof($this->logItems) > 0){
-            $this->logger->logBatch($this->logItems, 'MainFlow');
+            $this->logger->logBatch($this->logItems, $this->topic);
         }
 
         sem_remove($this->sem_id);

sample/demo.php

@@ -82,9 +82,9 @@ function getLogs(Aliyun_Log_Client $client, $project, $logstore) {
 $logger = new Aliyun_Log_Logger($client, $project, $logstore);
 
 //$logger->log('test', 'something wrong with the inner info', 'MainFlow');
-$batchLogger = new Aliyun_Log_Models_LogBatch(25, $logger);
+$batchLogger = new Aliyun_Log_Models_LogBatch( $logger,'MainFlow');
 
-for($i = 1; $i <= 133; $i++){
+for($i = 1; $i <= 9; $i++){
     $batchLogger->log('something wrong with the inner info '.$i,'info');
 }