php sdk更新 #8

Fnck · 2017-12-20T06:17:53Z

1、把request、response相关类移到对应文件夹，保持目录清爽
2、增加logger方式调用以及loglevel枚举
3、问题修复，自测通过

Fnck · 2017-12-20T06:37:35Z

php 7.1.7测试通过

suntingtao007 · 2018-01-10T14:46:25Z

Aliyun/Log/Logger.php

+            $request = new Aliyun_Log_Models_PutLogsRequest($this->project, $this->logstore,
+                $topic, $ip, $logItems);
+            $response = $this->client->putLogs($request);
+            print($response ->getRequestId());


去掉print

suntingtao007 · 2018-01-10T14:47:11Z

Aliyun/Log/Logger.php

@@ -39,9 +39,23 @@ public function log($logLevel, $logMessage, $topic){
            $response = $this->client->putLogs($request);
            print($response ->getRequestId());
        } catch (Aliyun_Log_Exception $ex) {
-            logVarDump($ex);
+            var_dump($ex);


所有的exception 都直接throw 出去，不要dump 下来

suntingtao007 · 2018-01-10T14:49:11Z

Aliyun/Log/Models/LogBatch.php

+
+    public function log($logMessage, $logLevel){
+        $contents = array( // key-value pair
+            'time'=>date('m/d/Y h:i:s a', time()),


时间不需要了，默认已经有了

suntingtao007 · 2018-01-10T14:50:04Z

Aliyun/Log/Models/LogBatch.php

+        $logItem = new Aliyun_Log_Models_LogItem();
+        $logItem->setTime(time());
+        $logItem->setContents($contents);
+        printf($logMessage.'<br>');


去掉print

suntingtao007 · 2018-01-10T14:52:20Z

Aliyun/Log/Models/LogBatch.php

+        $logItem = new Aliyun_Log_Models_LogItem();
+        $logItem->setTime(time());
+        $logItem->setContents($contents);
+        printf($logMessage.'<br>');


suntingtao007 · 2018-01-10T14:52:38Z

Aliyun/Log/Models/LogBatch.php

+            $this->arraySize = 5;
+        }
+        $this->logger = $logger;
+        if($sem_id == null || $shm_id == null){


如果sem_id , shm_id 等不为null的情况，会怎么样？

suntingtao007 · 2018-01-10T14:56:34Z

Aliyun/Log/Models/LogBatch.php

    }

    public function log($logMessage, $logLevel){
+        $prevoidCallTime = $this->previousLogTime;


这个更新逻辑有问题，只有发送的时候，才真正更新

suntingtao007 · 2018-01-10T14:58:20Z

Aliyun/Log/Models/LogBatch.php

+        $SEMKEY     =   22 + time();
+        $SHMKEY     =   33 + time();
+
+        $this->sem_id = sem_get($SEMKEY, 1);


在这边是否会遇到都线程同时操作这个logger对象的问题（这个我不是和确定），如果没有多线程问题，可以不加锁

suntingtao007 · 2018-01-10T14:59:30Z

Aliyun/Log/Models/LogBatch.php

        }
+        shm_put_var($this->shm_id, 1, $this->logItems);
+
    }

    public function log($logMessage, $logLevel){


对于log的话，单个message 有点太简单了，也可以直接同时写入多个key：value的模式，单个message 是一种特例。
可以提供一个log（level， array)的接口， log（level， message） => log (leve , array("msg"=>message));

2. bug修复

CLAassistant · 2018-01-16T08:34:41Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

suntingtao007 · 2018-01-21T13:14:32Z

Aliyun/Log/Models/LogBatch.php

-            array_push($logItems, $logItem);
+        if(is_array($logMessage)){
+            $logItemTemps = array();
+            foreach ($logMessage as &$logElement){


当这个作为一个array的时候，是一条message，而不是多条，一条message 可以有多个key,value。
传入的是array（其实是一个map）。

suntingtao007 · 2018-01-21T13:15:13Z

Aliyun/Log/Models/LogBatch.php

+            $logItemTemps = array();
+            foreach ($logMessage as &$logElement){
+                $contents = array( // key-value pair
+                    'time'=>date('m/d/Y h:i:s a', time()),


这边的time 字段不需要了，下面有

suntingtao007 · 2018-01-21T13:19:25Z

Aliyun/Log/Models/LogBatch.php

-            $prevoisCallTime = 0;
+        $previousCallTime = $this->previousLogTime;
+        if(NULL ===  $previousCallTime){
+            $previousCallTime = 0;


这个时间的判断逻辑有问题，修改如下：

previousCallTime = time() 初始的时候

每次调用一次log，检查 time() - previousCallTime > xxx 是否满足

如果满足 send data，并且更新previousCallTime = time（）

如果第二不检查不满足，则不send data，也不更新 previousCallTime。

suntingtao007 · 2018-01-21T13:24:18Z

Aliyun/Log/Models/LogBatch.php

-        $prevoisCallTime = $this->previousLogTime;
-        if(NULL ===  $prevoisCallTime){
-            $prevoisCallTime = 0;
+        $previousCallTime = $this->previousLogTime;


为了易用，这个log 接口，可以再加一个bool的参数， use_buffer （默认为true），如果设置为false，这立刻flush出去

suntingtao007 · 2018-02-01T07:54:32Z

Aliyun/Log/LoggerFactory.php

+        }
+        if($logstore === null || $logstore == ''){
+            throw new Exception('logstore name is blank!');
+        }
        if($topic === null){
            $topic = 'MainFlow';


if topic == NULL => topic = ""

suntingtao007 · 2018-02-01T07:55:56Z

Aliyun/Log/LoggerFactory.php

        }
-        return static::$instanceSimpleLogger;
+        return static::$loggerMap[$loggerKey];
    }

    protected function __construct()


析构的时候，检查一下每个logger 中，是否还要没有发送出去的数据，如果有的话，需要发送出去

suntingtao007 · 2018-02-01T07:59:49Z

Aliyun/Log/SimpleLogger.php

@@ -54,7 +63,7 @@ protected function __construct(Aliyun_Log_Logger $logger, $topic, $cacheLogCount
     * @param $logLevel
     * @param $topic should be null
     */
-    public function log(Aliyun_Log_Models_LogLevel_LogLevel $logLevel,$logMessage, $topic = null){
+    public function log(Aliyun_Log_Models_LogLevel_LogLevel $logLevel,$logMessage){
        $previousCallTime = $this->previousLogTime;


previousCallTime 只有每次发送之后，才更新，不是每次调用log 就更新

suntingtao007 · 2018-02-01T08:40:21Z

Aliyun/Log/SimpleLogger.php

@@ -73,7 +82,7 @@ public function log(Aliyun_Log_Models_LogLevel_LogLevel $logLevel,$logMessage, $
                $logItem->setContents($contents);
                array_push($logItemTemps, $logItem);
            }
-            $this->logger->logBatch($logItemTemps, $this->topic);
+            $this->logBatch($logItemTemps, $this->topic);


不是每次都发送，每次都是buffer 到cahce中。

suntingtao007 · 2018-02-01T08:41:29Z

Aliyun/Log/SimpleLogger.php

                $logItems = [];
            }
            $this->logItems = $logItems;
        }
    }

+    public function logSingleMessage(Aliyun_Log_Models_LogLevel_LogLevel $logLevel, $logMessage){


logSingleMessage 和 logArrayMessage 如果保留的话，前面那个log 函数就删除掉。

这两个函数都是把数据保存到cache中

Fnck added 2 commits December 20, 2017 13:50

sdk源文件目录调整，增加logger方式调用

8b0a8cb

sdk源文件目录调整，增加logger方式调用 - 问题修复

3c28da2

Fnck added 2 commits January 6, 2018 14:49

增加批量日志提交功能

91d5975

批量日志提交功能去掉线程锁，增加flush功能

28a4487

suntingtao007 reviewed Jan 10, 2018

View reviewed changes

1. 增加shipper相关接口，包括增删改查及shipperTask相关查询和重试

45cedf2

2. bug修复

Fnck added 5 commits January 16, 2018 16:38

注释增加

cab78ce

add batch log

b5b3546

parquet storage更新

cd00f2a

增加注释

3535684

update demo

6c0e7ff

suntingtao007 reviewed Jan 21, 2018

View reviewed changes

Fnck added 3 commits January 29, 2018 14:15

增加loggerFactory逻辑

ef4f26d

bug fixed

ec57d5f

logFactory重写

67f88e2

suntingtao007 reviewed Feb 1, 2018

View reviewed changes

Fnck added 6 commits February 1, 2018 20:04

code review重写

30ac7b1

updated

faa0341

updated

4215f3f

comment and description added

9232ddb

comment and description added

27208ab

comment and description added

c950d80

jimmyyem mentioned this pull request Apr 18, 2023

Required fields are missing #44

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

php sdk更新 #8

php sdk更新 #8

Fnck commented Dec 20, 2017

Fnck commented Dec 20, 2017

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018

suntingtao007 Jan 10, 2018 •

edited

Loading

CLAassistant commented Jan 16, 2018 •

edited

Loading

suntingtao007 Jan 21, 2018

suntingtao007 Jan 21, 2018

suntingtao007 Jan 21, 2018

suntingtao007 Jan 21, 2018

suntingtao007 Feb 1, 2018

suntingtao007 Feb 1, 2018

suntingtao007 Feb 1, 2018

suntingtao007 Feb 1, 2018

suntingtao007 Feb 1, 2018

php sdk更新 #8

Are you sure you want to change the base?

php sdk更新 #8

Conversation

Fnck commented Dec 20, 2017

Fnck commented Dec 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suntingtao007 Jan 10, 2018 • edited Loading

Choose a reason for hiding this comment

CLAassistant commented Jan 16, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suntingtao007 Jan 10, 2018 •

edited

Loading

CLAassistant commented Jan 16, 2018 •

edited

Loading