Merge pull request #270 from gregurco/move_logging_middlewares

Move logging middlewares before plugins initialization
8p · Oct 2, 2019 · b2e56e1 · b2e56e1
2 parents b045b21 + 4caa396
commit b2e56e1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/DependencyInjection/EightPointsGuzzleExtension.php b/src/DependencyInjection/EightPointsGuzzleExtension.php
@@ -139,12 +139,6 @@ protected function createHandler(ContainerBuilder $container, string $clientName
         $handlerStackServiceName = sprintf('eight_points_guzzle.handler_stack.%s', $clientName);
         $container->setDefinition($handlerStackServiceName, $handler);
 
-        if ($logging) {
-            $this->defineLogMiddleware($container, $handler, $clientName);
-            $this->defineRequestTimeMiddleware($container, $handler, $clientName);
-            $this->attachSymfonyLogMiddlewareToHandler($handler);
-        }
-
         if ($profiling) {
             $this->defineProfileMiddleware($container, $handler, $clientName);
         }
@@ -155,6 +149,12 @@ protected function createHandler(ContainerBuilder $container, string $clientName
             }
         }
 
+        if ($logging) {
+            $this->defineLogMiddleware($container, $handler, $clientName);
+            $this->defineRequestTimeMiddleware($container, $handler, $clientName);
+            $this->attachSymfonyLogMiddlewareToHandler($handler);
+        }
+
         // goes on the end of the stack.
         $handler->addMethodCall('unshift', [$eventExpression, 'events']);
 

diff --git a/src/Middleware/ProfileMiddleware.php b/src/Middleware/ProfileMiddleware.php
@@ -4,6 +4,9 @@
 
 use Symfony\Component\Stopwatch\Stopwatch;
 
+/**
+ * This Middleware is used to render request time slot on "Performance" tab in "Symfony Profiler".
+ */
 class ProfileMiddleware
 {
     /**

diff --git a/src/Middleware/RequestTimeMiddleware.php b/src/Middleware/RequestTimeMiddleware.php
@@ -62,7 +62,7 @@ protected function getOnStatsCallback($initialOnStats, $requestId) : \Closure
 
             $this->dataCollector->addTotalTime((float)$stats->getTransferTime());
 
-            if ($requestId && $this->logger instanceof Logger) {
+            if (($this->logger instanceof Logger) && $requestId) {
                 $this->logger->addTransferTimeByRequestId($requestId, (float)$stats->getTransferTime());
             }
         };