فهرست منبع

封装log函数

visuddhinanda 2 سال پیش
والد
کامیت
a6810ac6c6
2فایلهای تغییر یافته به همراه23 افزوده شده و 37 حذف شده
  1. 4 12
      rpc/tulip/tulip/pdo.php
  2. 19 25
      rpc/tulip/tulip/server.php

+ 4 - 12
rpc/tulip/tulip/pdo.php

@@ -1,20 +1,12 @@
 <?php
 <?php
-require dirname(__FILE__) . '/vendor/autoload.php';
+require_once dirname(__FILE__) . '/vendor/autoload.php';
+require_once dirname(__FILE__) . '/log.php';
 
 
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
 
 
 class PdoHelper
 class PdoHelper
 {
 {
     private $_pdo = null;
     private $_pdo = null;
-    private $log = null;
 
 
-    public function __construct()
-    {
-        // create a log channel
-        $this->log = new Logger('tulip');
-        $this->log->pushHandler(new StreamHandler(__DIR__ . '/logs/tulip-' . date("Y-m-d") . '.log'));
-    }
     public function connectDb()
     public function connectDb()
     {
     {
         /**
         /**
@@ -35,11 +27,11 @@ class PdoHelper
                 Config['database']['password'],
                 Config['database']['password'],
                 array(PDO::ATTR_PERSISTENT => true)
                 array(PDO::ATTR_PERSISTENT => true)
             );
             );
-            $this->log->info('connect to db success');
+            myLog()->info('connect to db success');
         } catch (PDOException $e) {
         } catch (PDOException $e) {
             echo 'connect to db fail' . PHP_EOL;
             echo 'connect to db fail' . PHP_EOL;
             print $e->getMessage();
             print $e->getMessage();
-            $this->log->error('connect to db fail');
+            myLog()->error('connect to db fail');
             return false;
             return false;
         }
         }
         $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

+ 19 - 25
rpc/tulip/tulip/server.php

@@ -2,21 +2,15 @@
 
 
 require_once dirname(__FILE__) . '/vendor/autoload.php';
 require_once dirname(__FILE__) . '/vendor/autoload.php';
 require_once dirname(__FILE__) . '/config.php';
 require_once dirname(__FILE__) . '/config.php';
-require_once dirname(__FILE__) . '/logger.php';
+require_once dirname(__FILE__) . '/console.php';
 require_once dirname(__FILE__) . '/pdo.php';
 require_once dirname(__FILE__) . '/pdo.php';
+require_once dirname(__FILE__) . '/log.php';
+
 
 
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
 
 
 class Greeter extends \Mint\Tulip\V1\SearchStub
 class Greeter extends \Mint\Tulip\V1\SearchStub
 {
 {
-    private $log = null;
-    public function __construct()
-    {
-        // create a log channel
-        $this->log = new Logger('tulip');
-        $this->log->pushHandler(new StreamHandler(__DIR__ . '/logs/tulip-' . date("Y-m-d") . '.log'));
-    }
+
     public function Pali(
     public function Pali(
         \Mint\Tulip\V1\SearchRequest $request,
         \Mint\Tulip\V1\SearchRequest $request,
         \Grpc\ServerContext $context
         \Grpc\ServerContext $context
@@ -26,8 +20,8 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
             $keyWords[] = $word;
             $keyWords[] = $word;
         }
         }
         $msg = "[" . date("Y/m/d h:i:sa") . "] pali search: request words = " . implode(',', $keyWords);
         $msg = "[" . date("Y/m/d h:i:sa") . "] pali search: request words = " . implode(',', $keyWords);
-        echo  $msg . PHP_EOL;
-        $this->log->info($msg);
+        console('debug',$msg);
+        myLog()->info($msg);
 
 
         $pdo = new PdoHelper;
         $pdo = new PdoHelper;
         $pdo->connectDb();
         $pdo->connectDb();
@@ -45,11 +39,11 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
             $queryBookId = '';
             $queryBookId = '';
         }
         }
         $msg = 'query books = ' . implode(',', $bookId);
         $msg = 'query books = ' . implode(',', $bookId);
-        echo  $msg . PHP_EOL;
-        $this->log->info($msg);
+        console('debug',$msg);
+        myLog()->info($msg);
 
 
         $matchMode = $request->getMatchMode();
         $matchMode = $request->getMatchMode();
-        echo 'query mode = ' . $matchMode . PHP_EOL;
+        console('debug','query mode = ' . $matchMode);
         $param = [];
         $param = [];
         switch ($matchMode) {
         switch ($matchMode) {
             case 'complete':
             case 'complete':
@@ -109,8 +103,8 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
         ) {
         ) {
             $total = $resultCount[0]['co'];
             $total = $resultCount[0]['co'];
         } else {
         } else {
-            logger('warning', 'result must be of type array' . $pdo->errorInfo());
-            $this->log->error('result must be of type array' . $pdo->errorInfo());
+            console('debug','warning', 'result must be of type array' . $pdo->errorInfo());
+            myLog()->error('result must be of type array' . $pdo->errorInfo());
             $total = 0;
             $total = 0;
         }
         }
 
 
@@ -163,8 +157,8 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
             }
             }
         }
         }
 
 
-        echo "total={$total}" . PHP_EOL;
-        $this->log->info("total={$total}");
+        console('debug',"total={$total}");
+        myLog()->info("total={$total}");
         $response->setTotal($total);
         $response->setTotal($total);
         return $response;
         return $response;
     }
     }
@@ -183,7 +177,7 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
         foreach ($request->getKeywords()->getIterator() as $word) {
         foreach ($request->getKeywords()->getIterator() as $word) {
             $keyWords[] = $word;
             $keyWords[] = $word;
         }
         }
-        echo "book list: request words = " . implode(',', $keyWords) . PHP_EOL;
+        console('debug',"book list: request words = " . implode(',', $keyWords));
         /**
         /**
          * 查询业务逻辑
          * 查询业务逻辑
          */
          */
@@ -199,10 +193,10 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
         } else {
         } else {
             $queryBookId = '';
             $queryBookId = '';
         }
         }
-        echo 'query books = ' . implode(',', $bookId) . PHP_EOL;
+        console('debug','query books = ' . implode(',', $bookId));
 
 
         $matchMode = $request->getMatchMode();
         $matchMode = $request->getMatchMode();
-        echo 'query mode = ' . $matchMode . PHP_EOL;
+        console('debug','query mode = ' . $matchMode);
         $queryWhere = $this->makeQueryWhere($keyWords, $matchMode);
         $queryWhere = $this->makeQueryWhere($keyWords, $matchMode);
         $query = "SELECT pcd_book_id, count(*) as co FROM fts_texts WHERE {$queryWhere['query']} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
         $query = "SELECT pcd_book_id, count(*) as co FROM fts_texts WHERE {$queryWhere['query']} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
         $result = $pdo->dbSelect($query, $queryWhere['param']);
         $result = $pdo->dbSelect($query, $queryWhere['param']);
@@ -218,7 +212,7 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
             }
             }
         }
         }
 
 
-        echo "total=" . count($output) . PHP_EOL;
+        console('debug',"total=" . count($output));
         return $response;
         return $response;
     }
     }
 
 
@@ -264,11 +258,11 @@ class Greeter extends \Mint\Tulip\V1\SearchStub
 $port = Config['port'];
 $port = Config['port'];
 
 
 if (!isset($port)) {
 if (!isset($port)) {
-    echo 'parameter port is required. ';
+    console('debug','parameter port is required. ');
     return;
     return;
 }
 }
 $server = new \Grpc\RpcServer();
 $server = new \Grpc\RpcServer();
 $server->addHttp2Port('0.0.0.0:' . $port);
 $server->addHttp2Port('0.0.0.0:' . $port);
 $server->handle(new Greeter());
 $server->handle(new Greeter());
-echo 'Listening on port :' . $port . PHP_EOL;
+console('debug','Listening on port :' . $port);
 $server->run();
 $server->run();