Consistently use socket path (php-pm#320)

andig · web-flow · commit 0ab51e866d66 · 2018-01-06T19:09:12.000+01:00
* Fix slave socket path usage

* Make ProcessClient name consistent

* Move socketpath to required parameters
diff --git a/src/Commands/StatusCommand.php b/src/Commands/StatusCommand.php
@@ -2,7 +2,7 @@
 
 namespace PHPPM\Commands;
 
-use PHPPM\Client;
+use PHPPM\ProcessClient;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -33,7 +33,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $config = $this->initializeConfig($input, $output, false);
 
-        $handler = new Client();
+        $handler = new ProcessClient();
         $handler->setSocketPath($config['socket-path']);
         $handler->getStatus(function ($status) use ($output) {
             $output->writeln($this->parseStatus($status));
diff --git a/src/Commands/StopCommand.php b/src/Commands/StopCommand.php
@@ -2,8 +2,7 @@
 
 namespace PHPPM\Commands;
 
-// use PHPPM\ProcessManager;
-use PHPPM\Client;
+use PHPPM\ProcessClient;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -35,7 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $config = $this->initializeConfig($input, $output, false);
 
-        $handler = new Client();
+        $handler = new ProcessClient();
         $handler->setSocketPath($config['socket-path']);
 
         $handler->stopProcessManager(function ($status) use ($output) {
diff --git a/src/ProcessClient.php b/src/ProcessClient.php
@@ -7,7 +7,7 @@
 use React\Socket\UnixConnector;
 use React\Socket\ConnectionInterface;
 
-class Client
+class ProcessClient
 {
     use ProcessCommunicationTrait;
 
diff --git a/src/ProcessCommunicationTrait.php b/src/ProcessCommunicationTrait.php
@@ -125,6 +125,14 @@ protected function getControllerSocketPath($overwrite = true)
         return $this->getSockFile('controller', $overwrite);
     }
 
+    /**
+     * @return string
+     */
+    public function getSocketPath()
+    {
+        return $this->socketPath;
+    }
+
     /**
      * @param string $socketPath
      */
diff --git a/src/ProcessManager.php b/src/ProcessManager.php
@@ -378,8 +378,7 @@ public function run()
         ob_implicit_flush(1);
 
         $this->loop = Factory::create();
-        $this->controllerHost = $this->getControllerSocketPath();
-        $this->controller = new UnixServer($this->controllerHost, $this->loop);
+        $this->controller = new UnixServer($this->getControllerSocketPath(), $this->loop);
         $this->controller->on('connection', array($this, 'onSlaveConnection'));
 
         $this->web = new Server(sprintf('%s:%d', $this->host, $this->port), $this->loop);
@@ -860,13 +859,13 @@ protected function newSlaveInstance($port)
             $this->output->writeln(sprintf("Start new worker #%d", $port));
         }
 
+        $socketpath = var_export($this->getSocketPath(), true);
         $bridge = var_export($this->getBridge(), true);
         $bootstrap = var_export($this->getAppBootstrap(), true);
 
         $config = [
             'port' => $port,
             'session_path' => session_save_path(),
-            'controllerHost' => $this->controllerHost,
 
             'app-env' => $this->getAppEnv(),
             'debug' => $this->isDebug(),
@@ -894,7 +893,7 @@ protected function newSlaveInstance($port)
 }
 
 //global for all global functions
-ProcessSlave::\$slave = new ProcessSlave($bridge, $bootstrap, $config);
+ProcessSlave::\$slave = new ProcessSlave($socketpath, $bridge, $bootstrap, $config);
 ProcessSlave::\$slave->run();
 EOF;
 
diff --git a/src/ProcessSlave.php b/src/ProcessSlave.php
@@ -117,12 +117,13 @@ class ProcessSlave
      */
     protected $config;
 
-    public function __construct($bridgeName = null, $appBootstrap, array $config = [])
+    public function __construct($socketpath, $bridgeName = null, $appBootstrap, array $config = [])
     {
-        $this->config = $config;
-        $this->appBootstrap = $appBootstrap;
+        $this->setSocketPath($socketpath);
+
         $this->bridgeName = $bridgeName;
-        $this->baseServer = $_SERVER;
+        $this->appBootstrap = $appBootstrap;
+        $this->config = $config;
 
         if ($this->config['session_path']) {
             session_save_path($this->config['session_path']);
@@ -303,7 +304,9 @@ public function run()
         ErrorHandler::register(new ErrorHandler($this->errorLogger));
 
         $connector = new UnixConnector($this->loop);
-        $connector->connect($this->config['controllerHost'])->done(
+        $unixSocket = $this->getControllerSocketPath(false);
+
+        $connector->connect($unixSocket)->done(
             function($controller) {
                 $this->controller = $controller;
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use React\Socket\UnixConnector;`
`8`	`8`	`use React\Socket\ConnectionInterface;`
`9`	`9`
`10`		`-class Client`
	`10`	`+class ProcessClient`
`11`	`11`	`{`
`12`	`12`	`use ProcessCommunicationTrait;`
`13`	`13`