Fixed issue with error, for stopwatch subscriber

csarrazi · Jan 13, 2015 · 7dd773d · 7dd773d
1 parent 8b80728
commit 7dd773d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/dist/GuzzleHttp/Subscriber/StopwatchSubscriber.php b/dist/GuzzleHttp/Subscriber/StopwatchSubscriber.php
@@ -13,6 +13,7 @@
 
 use GuzzleHttp\Event\CompleteEvent;
 use GuzzleHttp\Event\BeforeEvent;
+use GuzzleHttp\Event\ErrorEvent;
 use GuzzleHttp\Event\RequestEvents;
 use GuzzleHttp\Event\SubscriberInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -36,7 +37,7 @@ public function getEvents()
         return [
             'before'   => ['onBefore', RequestEvents::EARLY],
             'complete' => ['onFinish', RequestEvents::LATE],
-            'error'    => ['onFinish', RequestEvents::EARLY],
+            'error'    => ['onError', RequestEvents::EARLY],
         ];
     }
 
@@ -55,4 +56,15 @@ public function onFinish(CompleteEvent $event)
 
         $this->stopwatch->stop($url);
     }
+
+    public function onError(ErrorEvent $event)
+    {
+        $url = $event->getRequest()->getUrl();
+
+        if (!$this->stopwatch->isStarted($url)) {
+            return;
+        }
+
+        $this->stopwatch->stop($url);
+    }
 }