upd WSConnectorAbstract

close old connection before new and static for current node
GolosChain · May 8, 2018 · 114075f · 114075f
1 parent 298c304
commit 114075f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Connectors/WebSocket/WSConnectorAbstract.php b/Connectors/WebSocket/WSConnectorAbstract.php
@@ -37,7 +37,7 @@ abstract class WSConnectorAbstract implements ConnectorInterface
      *
      * @var string
      */
-    private $currentNodeURL;
+    protected static $currentNodeURL;
 
     /**
      * waiting answer from Node during $wsTimeoutSeconds seconds
@@ -145,18 +145,18 @@ public function newConnection($nodeUrl)
 
     public function getCurrentUrl()
     {
-        if ($this->currentNodeURL === null) {
+        if (static::$currentNodeURL === null) {
             if (is_array(static::$nodeURL)) {
                 $this->reserveNodeUrlList = static::$nodeURL;
                 $url = array_shift($this->reserveNodeUrlList);
             } else {
                 $url = static::$nodeURL;
             }
 
-            $this->currentNodeURL = $url;
+            static::$currentNodeURL = $url;
         }
 
-        return $this->currentNodeURL;
+        return static::$currentNodeURL;
     }
 
     public function isExistReserveNodeUrl()
@@ -166,11 +166,13 @@ public function isExistReserveNodeUrl()
 
     protected function setReserveNodeUrlToCurrentUrl()
     {
-        $this->currentNodeURL = array_shift($this->reserveNodeUrlList);
+        static::$currentNodeURL = array_shift($this->reserveNodeUrlList);
     }
 
     public function connectToReserveNode()
     {
+        $connection = $this->getConnection();
+        $connection->close();
         $this->setReserveNodeUrlToCurrentUrl();
         return $this->newConnection($this->getCurrentUrl());
     }