Merge remote-tracking branch 'origin/MAGETWO-90466-amqp' into pr

Joan He · Joan He · commit 31780d96795b · 2018-04-20T14:41:39.000-05:00
diff --git a/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php b/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php
@@ -92,7 +92,7 @@ public function install()
                 $amqpConfig = $this->configPool->get($exchange->getConnection());
                 $this->exchangeInstaller->install($amqpConfig->getChannel(), $exchange);
             }
-        } catch (\PhpAmqpLib\Exception\AMQPExceptionInterface $e) {
+        } catch (\Exception $e) {
             $this->logger->error("AMQP topology installation failed: {$e->getMessage()}\n{$e->getTraceAsString()}");
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function install()`
`92`	`92`	`$amqpConfig = $this->configPool->get($exchange->getConnection());`
`93`	`93`	`$this->exchangeInstaller->install($amqpConfig->getChannel(), $exchange);`
`94`	`94`	`}`
`95`		`- } catch (\PhpAmqpLib\Exception\AMQPExceptionInterface $e) {`
	`95`	`+ } catch (\Exception $e) {`
`96`	`96`	`$this->logger->error("AMQP topology installation failed: {$e->getMessage()}\n{$e->getTraceAsString()}");`
`97`	`97`	`}`
`98`	`98`	`}`