Allow the detection of transient connections to be configured.

atrauzzi · atrauzzi · commit 36d4e019b27d · 2020-10-07T19:04:52.000-05:00
diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php
@@ -74,14 +74,14 @@ public function __construct($config = 'stomp:')
      */
     public function createContext(): Context
     {
-        if ($this->config['lazy']) {
-            return new StompContext(
-                function () { return $this->establishConnection(); },
-                $this->config['target']
-            );
-        }
+        $stomp = $this->config['lazy']
+            ? function () { return $this->establishConnection(); }
+        : $this->establishConnection();
+
+        $target = $this->config['target'];
+        $detectTransientConnections = (bool) $this->config['detect_transient_connections'];
 
-        return new StompContext($this->establishConnection(), $this->config['target']);
+        return new StompContext($stomp, $target, $detectTransientConnections);
     }
 
     private function establishConnection(): BufferedStompClient
diff --git a/pkg/stomp/StompContext.php b/pkg/stomp/StompContext.php
@@ -45,9 +45,8 @@ class StompContext implements Context
 
     /**
      * @param BufferedStompClient|callable $stomp
-     * @param mixed                        $transient
      */
-    public function __construct($stomp, string $extensionType, $transient = true)
+    public function __construct($stomp, string $extensionType, bool $detectTransientConnections = false)
     {
         if ($stomp instanceof BufferedStompClient) {
             $this->stomp = $stomp;
@@ -59,7 +58,7 @@ public function __construct($stomp, string $extensionType, $transient = true)
 
         $this->extensionType = $extensionType;
         $this->useExchangePrefix = ExtensionType::RABBITMQ === $extensionType;
-        $this->transient = $transient;
+        $this->transient = $detectTransientConnections;
     }
 
     /**
@@ -190,7 +189,7 @@ public function createConsumer(Destination $destination): Consumer
      */
     public function createProducer(): Producer
     {
-        if ($this->transient && true == $this->stomp) {
+        if ($this->transient && $this->stomp) {
             $this->stomp->disconnect();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ class StompContext implements Context`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* @param BufferedStompClient\|callable $stomp`
`48`		`- * @param mixed $transient`
`49`	`48`	`*/`
`50`		`- public function __construct($stomp, string $extensionType, $transient = true)`
	`49`	`+ public function __construct($stomp, string $extensionType, bool $detectTransientConnections = false)`
`51`	`50`	`{`
`52`	`51`	`if ($stomp instanceof BufferedStompClient) {`
`53`	`52`	`$this->stomp = $stomp;`
`@@ -59,7 +58,7 @@ public function __construct($stomp, string $extensionType, $transient = true)`
`59`	`58`
`60`	`59`	`$this->extensionType = $extensionType;`
`61`	`60`	`$this->useExchangePrefix = ExtensionType::RABBITMQ === $extensionType;`
`62`		`- $this->transient = $transient;`
	`61`	`+ $this->transient = $detectTransientConnections;`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`/**`
`@@ -190,7 +189,7 @@ public function createConsumer(Destination $destination): Consumer`
`190`	`189`	`*/`
`191`	`190`	`public function createProducer(): Producer`
`192`	`191`	`{`
`193`		`- if ($this->transient && true == $this->stomp) {`
	`192`	`+ if ($this->transient && $this->stomp) {`
`194`	`193`	`$this->stomp->disconnect();`
`195`	`194`	`}`
`196`	`195`