make guzzle service configuration more complex so we can use retry middleware.

bangpound · bangpound · commit 1cd6454aa677 · 2016-12-31T19:02:00.000-06:00
diff --git a/Guzzle/RetryMiddleware.php b/Guzzle/RetryMiddleware.php
@@ -2,16 +2,14 @@
 
 namespace RShief\Nab3aBundle\Guzzle;
 
-use GuzzleHttp\Exception;
+use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7;
 use Psr\Http\Message\RequestInterface;
-use Psr\Log\LoggerAwareTrait;
+use Symfony\Component\VarDumper\VarDumper;
 
 class RetryMiddleware
 {
-    use LoggerAwareTrait;
-
     /**
      * @var callable
      */
@@ -43,30 +41,30 @@ public static function retry()
     private static function retryMiddlewares()
     {
         return array(
+          [Middleware::retry(self::connectExceptionDecider(), self::linearDelay(250, 16000)), 'connect_error'],
           [Middleware::retry(self::httpErrorDecider(), self::exponentialDelay(5000, 320000)), 'http_error'],
           [Middleware::retry(self::rateLimitErrorDecider(), self::exponentialDelay(60000)), 'rate_limit'],
-          [Middleware::retry(self::connectExceptionDecider(), self::linearDelay(250, 16000)), 'connect_error'],
         );
     }
 
     public static function connectExceptionDecider()
     {
-        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {
-            return $exception instanceof Exception\ConnectException;
+        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {
+            return ! (bool) $response || $error instanceof ConnectException;
         };
     }
 
     public static function rateLimitErrorDecider()
     {
-        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {
-            return $exception instanceof Exception\ClientException && $exception->hasResponse() && $exception->getResponse()->getStatusCode() === 420;
+        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {
+            return $response && $response->getStatusCode() === 420;
         };
     }
 
     public static function httpErrorDecider()
     {
-        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {
-            return $exception instanceof Exception\BadResponseException;
+        return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {
+            return $response && $response->getStatusCode() >= 400;
         };
     }
 
diff --git a/Guzzle/StackMiddlewareCompilerPass.php b/Guzzle/StackMiddlewareCompilerPass.php
@@ -21,21 +21,36 @@ public function process(ContainerBuilder $container)
         $stacks = [];
         foreach ($serviceIds as $serviceId => $tags) {
             foreach ($tags as $tag) {
-                $clientId = $tag['id'];
-                $stacks[$clientId][] = $serviceId;
+                $clientId = $tag['client'];
+                unset($tag['client']);
+                $stacks[$clientId][] = array_merge(['method' => 'push'], $tag, ['service' => $serviceId]);
             }
         }
 
-        foreach ($stacks as $clientId => $middlewareIds) {
+        foreach ($stacks as $clientId => $middlewares) {
             $clientDefinition = $container->getDefinition($clientId);
             $arguments = $clientDefinition->getArguments();
 
             $handlerDefinition = self::hasHandlerDefinition($arguments) ? self::getHandlerDefinition($arguments) : self::newHandlerDefinition($container);
 
             $stackDefinition = new DefinitionDecorator('nab3a.guzzle.handler_stack');
             $stackDefinition->setArguments([$handlerDefinition]);
-            foreach ($middlewareIds as $name => $middlewareId) {
-                $stackDefinition->addMethodCall('push', [new Reference($middlewareId), $middlewareId]);
+            $earlyMiddleware = array_filter($middlewares, function ($middleware) {
+                return !array_key_exists('before', $middleware) && !array_key_exists('after', $middleware);
+            });
+            $lateMiddleware = array_diff_key($middlewares, $earlyMiddleware);
+            foreach ($earlyMiddleware + $lateMiddleware as $middleware) {
+                $method = $middleware['method'];
+                $stackArguments = [
+                  new Reference($middleware['service']),
+                  $middleware['middleware_name']
+                ];
+                if (isset($middleware['before']) || isset($middleware['after'])) {
+                    $method = isset($middleware['before']) ? 'before' : 'after';
+                    array_unshift($stackArguments, $middleware[$method]);
+                }
+
+                $stackDefinition->addMethodCall($method, $stackArguments);
             }
 
             $arguments[0]['handler'] = $stackDefinition;
diff --git a/Resources/config/guzzle.yml b/Resources/config/guzzle.yml
@@ -7,25 +7,25 @@ services:
         shared: false
         factory: [ GuzzleHttp\Middleware, httpErrors ]
         tags:
-            - { name: guzzle.middleware, id: nab3a.guzzle.client }
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
+            - { name: guzzle.middleware, client: nab3a.guzzle.client, middleware_name: http_errors }
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: http_errors }
 
     nab3a.guzzle.middleware.prepare_body:
         class: Closure
         public: false
         shared: false
         factory: [ GuzzleHttp\Middleware, prepareBody ]
         tags:
-            - { name: guzzle.middleware, id: nab3a.guzzle.client }
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
+            - { name: guzzle.middleware, client: nab3a.guzzle.client, middleware_name: prepare_body }
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: prepare_body }
 
     nab3a.guzzle.middleware.history:
         class: Closure
         factory: [ RShief\Nab3aBundle\Guzzle\HistoryMiddleware, history ]
         public: false
         shared: false
         tags:
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: history }
 
     nab3a.guzzle.middleware.history.container:
         class: ArrayObject
@@ -36,8 +36,6 @@ services:
         public: false
         shared: false
         factory: [ RShief\Nab3aBundle\Guzzle\RetryMiddleware, retry ]
-        tags:
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
 
     nab3a.guzzle.middleware.oauth:
         class: GuzzleHttp\Subscriber\Oauth\Oauth1
@@ -51,8 +49,8 @@ services:
         arguments: [ '@?logger', '@nab3a.guzzle.middleware.log.formatter' ]
         tags:
             - { name: monolog.logger, channel: guzzle }
-            - { name: guzzle.middleware, id: nab3a.guzzle.client }
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
+            - { name: guzzle.middleware, client: nab3a.guzzle.client, middleware_name: log, after: retry }
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: log, after: retry }
         public: false
         shared: false
 
diff --git a/Resources/config/twitter.yml b/Resources/config/twitter.yml
@@ -52,4 +52,10 @@ services:
                 token:           '%nab3a.twitter.access_token%'
                 token_secret:    '%nab3a.twitter.access_token_secret%'
         tags:
-            - { name: guzzle.middleware, id: nab3a.twitter.guzzle.client }
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: oauth }
+
+    nab3a.twitter.guzzle.middleware.retry:
+        parent: nab3a.guzzle.middleware.retry
+        tags:
+            - { name: guzzle.middleware, client: nab3a.twitter.guzzle.client, middleware_name: retry }
+

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace RShief\Nab3aBundle\Guzzle;`
`4`	`4`
`5`		`-use GuzzleHttp\Exception;`
	`5`	`+use GuzzleHttp\Exception\ConnectException;`
`6`	`6`	`use GuzzleHttp\Middleware;`
`7`	`7`	`use GuzzleHttp\Psr7;`
`8`	`8`	`use Psr\Http\Message\RequestInterface;`
`9`		`-use Psr\Log\LoggerAwareTrait;`
	`9`	`+use Symfony\Component\VarDumper\VarDumper;`
`10`	`10`
`11`	`11`	`class RetryMiddleware`
`12`	`12`	`{`
`13`		`- use LoggerAwareTrait;`
`14`		`-`
`15`	`13`	`/**`
`16`	`14`	`* @var callable`
`17`	`15`	`*/`
`@@ -43,30 +41,30 @@ public static function retry()`
`43`	`41`	`private static function retryMiddlewares()`
`44`	`42`	`{`
`45`	`43`	`return array(`
	`44`	`+ [Middleware::retry(self::connectExceptionDecider(), self::linearDelay(250, 16000)), 'connect_error'],`
`46`	`45`	`[Middleware::retry(self::httpErrorDecider(), self::exponentialDelay(5000, 320000)), 'http_error'],`
`47`	`46`	`[Middleware::retry(self::rateLimitErrorDecider(), self::exponentialDelay(60000)), 'rate_limit'],`
`48`		`- [Middleware::retry(self::connectExceptionDecider(), self::linearDelay(250, 16000)), 'connect_error'],`
`49`	`47`	`);`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`public static function connectExceptionDecider()`
`53`	`51`	`{`
`54`		`- return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {`
`55`		`- return $exception instanceof Exception\ConnectException;`
	`52`	`+ return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {`
	`53`	`+ return ! (bool) $response \|\| $error instanceof ConnectException;`
`56`	`54`	`};`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`public static function rateLimitErrorDecider()`
`60`	`58`	`{`
`61`		`- return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {`
`62`		`- return $exception instanceof Exception\ClientException && $exception->hasResponse() && $exception->getResponse()->getStatusCode() === 420;`
	`59`	`+ return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {`
	`60`	`+ return $response && $response->getStatusCode() === 420;`
`63`	`61`	`};`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`public static function httpErrorDecider()`
`67`	`65`	`{`
`68`		`- return function ($retries, Psr7\Request $request, Psr7\Response $response = null, Exception\RequestException $exception = null) {`
`69`		`- return $exception instanceof Exception\BadResponseException;`
	`66`	`+ return function ($retries, Psr7\Request $request, Psr7\Response $response = null, $error = null) {`
	`67`	`+ return $response && $response->getStatusCode() >= 400;`
`70`	`68`	`};`
`71`	`69`	`}`
`72`	`70`