up: optimize log for output json

swoft-cloud · May 7, 2021 · 2a5774d · 2a5774d
1 parent a159af8
commit 2a5774d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/log/src/Handler/FileHandler.php b/src/log/src/Handler/FileHandler.php
@@ -101,8 +101,8 @@ protected function write(array $records): void
         } else {
             $records = array_column($records, 'formatted');
         }
-        $messageText = implode("\n", $records) . "\n";
 
+        $messageText = implode("\n", $records) . "\n";
         if (Co::id() <= 0) {
             throw new InvalidArgumentException('Write log file must be under Coroutine!');
         }
@@ -125,6 +125,7 @@ protected function write(array $records): void
     private function recordFilter(array $records): array
     {
         $messages = [];
+        $outJson = Log::getLogger()->isJson();
         foreach ($records as $record) {
             if (!isset($record['level'])) {
                 continue;
@@ -133,8 +134,15 @@ private function recordFilter(array $records): array
                 continue;
             }
 
-            $record              = $this->processRecord($record);
-            $record['formatted'] = $this->getFormatter()->format($record);
+            $record = $this->processRecord($record);
+
+            // format record
+            if ($outJson) {
+                // optimize, dont call formatter
+                $record['formatted'] = '';
+            } else {
+                $record['formatted'] = $this->getFormatter()->format($record);
+            }
 
             $messages[] = $record;
         }

diff --git a/src/log/src/Logger.php b/src/log/src/Logger.php
@@ -323,7 +323,8 @@ public function getProfilesInfos(): string
             if (!isset($profile['cost'], $profile['total'])) {
                 continue;
             }
-            $cost         = sprintf('%.2f', $profile['cost'] * 1000);
+
+            $cost = sprintf('%.2f', $profile['cost'] * 1000);
 
             $profileAry[] = "$key=" . $cost . '(ms)/' . $profile['total'];
         }