[client] update rabbitmq stomp driver configuration

makasim · makasim · commit 01f00d8f15f9 · 2018-11-21T16:41:53.000+02:00
diff --git a/pkg/enqueue/Client/DriverFactory.php b/pkg/enqueue/Client/DriverFactory.php
@@ -2,12 +2,9 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Client\Driver\RabbitMqDriver;
 use Enqueue\Client\Driver\RabbitMqStompDriver;
 use Enqueue\Client\Driver\StompManagementClient;
 use Enqueue\Dsn\Dsn;
-use Enqueue\Stomp\StompConnectionFactory;
-use Interop\Amqp\AmqpConnectionFactory;
 use Interop\Queue\ConnectionFactory;
 
 final class DriverFactory implements DriverFactoryInterface
@@ -25,36 +22,8 @@ public function create(ConnectionFactory $factory, Config $config, RouteCollecti
         if ($driverInfo = $this->findDriverInfo($dsn, Resources::getAvailableDrivers())) {
             $driverClass = $driverInfo['driverClass'];
 
-            if (RabbitMqDriver::class === $driverClass) {
-                if (false == $factory instanceof AmqpConnectionFactory) {
-                    throw new \LogicException(sprintf(
-                        'The factory must be instance of "%s", got "%s"',
-                        AmqpConnectionFactory::class,
-                        get_class($factory)
-                    ));
-                }
-
-                return new RabbitMqDriver($factory->createContext(), $config, $collection);
-            }
-
             if (RabbitMqStompDriver::class === $driverClass) {
-                if (false == $factory instanceof StompConnectionFactory) {
-                    throw new \LogicException(sprintf(
-                        'The factory must be instance of "%s", got "%s"',
-                        StompConnectionFactory::class,
-                        get_class($factory)
-                    ));
-                }
-
-                $managementClient = StompManagementClient::create(
-                    ltrim($dsn->getPath(), '/'),
-                    $dsn->getHost() ?: 'localhost',
-                    $config->getDriverOption('management_plugin_port', 15672),
-                    (string) $dsn->getUser(),
-                    (string) $dsn->getPassword()
-                );
-
-                return new RabbitMqStompDriver($factory->createContext(), $config, $collection, $managementClient);
+                return $this->createRabbitMqStompDriver($factory, $dsn, $config, $collection);
             }
 
             return new $driverClass($factory->createContext(), $config, $collection);
@@ -111,4 +80,20 @@ private function findDriverInfo(Dsn $dsn, array $factories): ?array
 
         return null;
     }
+
+    private function createRabbitMqStompDriver(ConnectionFactory $factory, Dsn $dsn, Config $config, RouteCollection $collection): RabbitMqStompDriver
+    {
+        $defaultManagementHost = $dsn->getHost() ?: $config->getTransportOption('host', 'localhost');
+        $managementVast = ltrim($dsn->getPath(), '/') ?: $config->getTransportOption('vhost', '/');
+
+        $managementClient = StompManagementClient::create(
+            urldecode($managementVast),
+            $config->getDriverOption('rabbitmq_management_host', $defaultManagementHost),
+            $config->getDriverOption('rabbitmq_management_port', 15672),
+            (string) $dsn->getUser() ?: $config->getTransportOption('user', 'guest'),
+            (string) $dsn->getPassword() ?: $config->getTransportOption('pass', 'guest')
+        );
+
+        return new RabbitMqStompDriver($factory->createContext(), $config, $collection, $managementClient);
+    }
 }
