fix log concurrency repeat log

swoft-cloud · Dec 26, 2019 · c6b396f · c6b396f
1 parent 9c107f5
commit c6b396f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/http-server/src/Middleware/MiddlewareRegister.php b/src/http-server/src/Middleware/MiddlewareRegister.php
@@ -103,7 +103,7 @@ public static function register(): void
             $methodMiddlewares     = $middlewares['methods'] ?? [];
 
             foreach ($methodMiddlewares as $methodName => $oneMethodMiddlewares) {
-                if (!empty($oneMethodMiddlewares) || !empty($oneMethodMiddlewares)) {
+                if (!empty($oneMethodMiddlewares)) {
                     $allMiddlewares = array_merge($controllerMiddlewares, $oneMethodMiddlewares);
 
                     self::$handlerMiddlewares[$className][$methodName] = array_unique($allMiddlewares);
@@ -128,4 +128,4 @@ public static function getMiddlewares(string $className, string $methodName): ar
         $middlewares = self::$middlewares[$className]['controller'] ?? [];
         return $middlewares;
     }
-}
+}
diff --git a/src/log/src/Logger.php b/src/log/src/Logger.php
@@ -435,15 +435,17 @@ public function flushLog(): void
             return;
         }
 
+        $messages = $this->messages;
+
+        // Clear message
+        $this->messages = [];
+
         reset($this->handlers);
 
         while ($handler = current($this->handlers)) {
-            $handler->handleBatch($this->messages);
+            $handler->handleBatch($messages);
             next($this->handlers);
         }
-
-        // Clear message
-        $this->messages = [];
     }
 
     /**