Try to make Server connector a bit more nice

the-eater · Oct 11, 2017 · 2defb1b · 2defb1b
1 parent a265ee9
commit 2defb1b
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/src/Server.php b/src/Server.php
@@ -23,32 +23,37 @@ public function __construct($uri, LoopInterface $loop, array $context = array())
             'unix' => array(),
         );
 
+        $server = $this->getServer($uri, $loop, $context);
+        $this->server = $server;
+
+        $that = $this;
+        $server->on('connection', function (ConnectionInterface $conn) use ($that) {
+            $that->emit('connection', array($conn));
+        });
+        $server->on('error', function (\Exception $error) use ($that) {
+            $that->emit('error', array($error));
+        });
+    }
+
+    private function getServer($uri, $loop, $context) {
         $scheme = 'tcp';
         $pos = strpos($uri, '://');
         if ($pos !== false) {
             $scheme = substr($uri, 0, $pos);
         }
 
         if ($scheme === 'unix') {
-            $server = new UnixServer($uri, $loop, $context['unix']);
+            return new UnixServer($uri, $loop, $context['unix']);
         }
-        else {
-            $server = new TcpServer(str_replace('tls://', '', $uri), $loop, $context['tcp']);
 
-            if ($scheme === 'tls') {
+        $server = new TcpServer(str_replace('tls://', '', $uri), $loop, $context['tcp']);
-                $server = new SecureServer($server, $loop, $context['tls']);
+
-            }
+        if ($scheme === 'tls') {
+            $server = new SecureServer($server, $loop, $context['tls']);
         }
 
-        $this->server = $server;
+        return $server;
 
-        $that = $this;
-        $server->on('connection', function (ConnectionInterface $conn) use ($that) {
-            $that->emit('connection', array($conn));
-        });
-        $server->on('error', function (\Exception $error) use ($that) {
-            $that->emit('error', array($error));
-        });
     }
 
     public function getAddress()