Merge pull request #7 from inhere/master

update helper method ConsoleUtil::log
swoft-cloud · Apr 4, 2018 · 2cd14ba · 2cd14ba
2 parents a738d97 + 34aa14e
commit 2cd14ba
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -2,18 +2,18 @@
 
 Swoft Console Component
 
-# Install
+## Install
 
 - composer command
 
 ```bash
 composer require swoft/console
 ```
 
-# Document
+## Document
 
 Please see [document site](https://doc.swoft.org)
 
-# LICENSE
+## LICENSE
 
 The Component is open-sourced software licensed under the [Apache license](LICENSE).
diff --git a/src/Helper/ConsoleUtil.php b/src/Helper/ConsoleUtil.php
@@ -30,17 +30,37 @@ class ConsoleUtil
      * @param string $msg
      * @param array $data
      * @param string $type
+     * @param array $opts
+     * [
+     *  '_category' => 'application',
+     *  'process' => 'work',
+     *  'pid' => 234,
+     *  'coId' => 12,
+     * ]
      */
-    public static function log(string $msg, array $data = [], string $type = 'info')
+    public static function log(string $msg, array $data = [], string $type = 'info', array $opts = [])
     {
         if (isset(self::LOG_LEVEL2TAG[$type])) {
             $type = Style::wrap(\strtoupper($type), self::LOG_LEVEL2TAG[$type]);
         }
 
+        $userOpts = [];
+
+        foreach ($opts as $n => $v) {
+            if (\is_numeric($n) || $n[0] === '_') {
+                $userOpts[] = "[$v]";
+            } else {
+                $userOpts[] = "[$n:$v]";
+            }
+        }
+
+        $optString = $userOpts ? ' ' . \implode(' ', $userOpts) : '';
+
         \output()->writeln(\sprintf(
-            '%s [%s] %s %s',
+            '%s [%s]%s %s %s',
             \date('Y/m/d H:i:s'),
             $type,
+            $optString,
             \trim($msg),
             $data ? PHP_EOL . \json_encode($data, \JSON_UNESCAPED_SLASHES|\JSON_PRETTY_PRINT) : ''
         ));