Merge pull request #283 from swooletw/develop

Develop

Author: albertcht

src/Commands/HttpServerCommand.php

@@ -60,25 +60,6 @@ class HttpServerCommand extends Command
      */
     protected $config;
 
-    /**
-     * A manager to handle pid about the application.
-     *
-     * @var PidManager
-     */
-    protected $pidManager;
-
-    /**
-     * Create a an new HttpServerCommand instance.
-     *
-     * @param PidManager $pidManager
-     */
-    public function __construct(PidManager $pidManager)
-    {
-        parent::__construct();
-
-        $this->pidManager = $pidManager;
-    }
-
     /**
      * Execute the console command.
      *
@@ -170,7 +151,7 @@ protected function stop()
 
         // I don't known why Swoole didn't trigger "onShutdown" after sending SIGTERM.
         // So we should manually remove the pid file.
-        $this->pidManager->delete();
+        $this->laravel->make(PidManager::class)->delete();
 
         $this->info('> success');
     }
@@ -229,7 +210,10 @@ protected function showInfos()
         $workerNum = Arr::get($this->config, 'server.options.worker_num');
         $taskWorkerNum = Arr::get($this->config, 'server.options.task_worker_num');
         $isWebsocket = Arr::get($this->config, 'websocket.enabled');
+        $hasTaskWorker = $isWebsocket || Arr::get($this->config, 'queue.default') === 'swoole';
         $logFile = Arr::get($this->config, 'server.options.log_file');
+        $pidManager = $this->laravel->make(PidManager::class);
+        [$masterPid, $managerPid] = $pidManager->read();
 
         $table = [
             ['PHP Version', 'Version' => phpversion()],
@@ -240,9 +224,10 @@ protected function showInfos()
             ['Server Status', $isRunning ? 'Online' : 'Offline'],
             ['Reactor Num', $reactorNum],
             ['Worker Num', $workerNum],
-            ['Task Worker Num', $isWebsocket ? $taskWorkerNum : 0],
+            ['Task Worker Num', $hasTaskWorker ? $taskWorkerNum : 0],
             ['Websocket Mode', $isWebsocket ? 'On' : 'Off'],
-            ['PID', $isRunning ? implode(', ', $this->pidManager->read()) : 'None'],
+            ['Master PID', $isRunning ? $masterPid : 'None'],
+            ['Manager PID', $isRunning && $managerPid ? $managerPid : 'None'],
             ['Log Path', $logFile],
         ];
 
@@ -294,9 +279,9 @@ protected function getHotReloadProcess($server)
      */
     public function isRunning()
     {
-        $pids = $this->pidManager->read();
+        $pids = $this->laravel->make(PidManager::class)->read();
 
-        if ([] === $pids) {
+        if (! count($pids)) {
             return false;
         }
 
@@ -322,7 +307,7 @@ public function isRunning()
     protected function killProcess($sig, $wait = 0)
     {
         Process::kill(
-            Arr::first($this->pidManager->read()),
+            Arr::first($this->laravel->make(PidManager::class)->read()),
             $sig
         );
 

src/Concerns/InteractsWithWebsocket.php

@@ -40,6 +40,11 @@ trait InteractsWithWebsocket
      */
     protected $payloadParser;
 
+    /**
+     * @var SwooleTW\Http\Websocket\Rooms\RoomContract
+     */
+    protected $websocketRoom;
+
     /**
      * Websocket server events.
      *
@@ -217,6 +222,7 @@ protected function prepareWebsocket()
         if ($isWebsocket) {
             $this->events = array_merge($this->events ?? [], $this->wsEvents);
             $this->isServerWebsocket = true;
+            $this->prepareWebsocketRoom();
             $this->setPayloadParser(new $parser);
         }
     }
@@ -250,6 +256,20 @@ protected function prepareWebsocketHandler()
         $this->setWebsocketHandler($this->app->make($handlerClass));
     }
 
+    /**
+     * Prepare websocket room.
+     */
+    protected function prepareWebsocketRoom()
+    {
+        $config = $this->container->make('config');
+        $driver = $config->get('swoole_websocket.default');
+        $websocketConfig = $config->get("swoole_websocket.settings.{$driver}");
+        $className = $config->get("swoole_websocket.drivers.{$driver}");
+
+        $this->websocketRoom = new $className($websocketConfig);
+        $this->websocketRoom->prepare();
+    }
+
     /**
      * Set websocket handler.
      *
@@ -290,17 +310,8 @@ protected function createRoom(string $class, array $settings): RoomContract
      */
     protected function bindRoom(): void
     {
-        $this->app->singleton(RoomContract::class, function (Container $container) {
-            $config = $container->make('config');
-            $driver = $config->get('swoole_websocket.default');
-            $settings = $config->get("swoole_websocket.settings.{$driver}");
-            $className = $config->get("swoole_websocket.drivers.{$driver}");
-
-            // create room instance and initialize
-            $room = $this->createRoom($className, $settings);
-            $room->prepare();
-
-            return $room;
+        $this->app->singleton(RoomContract::class, function (Container $app) {
+            return $this->websocketRoom;
         });
 
         $this->app->alias(RoomContract::class, 'swoole.room');

src/HttpServiceProvider.php

@@ -2,19 +2,18 @@
 
 namespace SwooleTW\Http;
 
-use Illuminate\Database\DatabaseManager;
-use Illuminate\Queue\QueueManager;
-use Illuminate\Support\ServiceProvider;
-use SwooleTW\Http\Commands\HttpServerCommand;
-use SwooleTW\Http\Coroutine\Connectors\ConnectorFactory;
-use SwooleTW\Http\Coroutine\MySqlConnection;
 use SwooleTW\Http\Helpers\FW;
-use SwooleTW\Http\Server\Facades\Server;
+use Illuminate\Queue\QueueManager;
 use SwooleTW\Http\Server\PidManager;
-use SwooleTW\Http\Server\PidManagerFactory;
-use SwooleTW\Http\Task\Connectors\SwooleTaskConnector;
 use Swoole\Http\Server as HttpServer;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Database\DatabaseManager;
+use SwooleTW\Http\Server\Facades\Server;
+use SwooleTW\Http\Coroutine\MySqlConnection;
+use SwooleTW\Http\Commands\HttpServerCommand;
 use Swoole\Websocket\Server as WebsocketServer;
+use SwooleTW\Http\Task\Connectors\SwooleTaskConnector;
+use SwooleTW\Http\Coroutine\Connectors\ConnectorFactory;
 
 /**
  * @codeCoverageIgnore
@@ -45,12 +44,12 @@ abstract class HttpServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->registerPidManager();
         $this->mergeConfigs();
         $this->setIsWebsocket();
         $this->registerServer();
         $this->registerManager();
         $this->registerCommands();
+        $this->registerPidManager();
         $this->registerDatabaseDriver();
         $this->registerSwooleQueueDriver();
     }
@@ -117,7 +116,9 @@ protected function mergeConfigs()
     protected function registerPidManager(): void
     {
         $this->app->singleton(PidManager::class, function() {
-            return call_user_func(new PidManagerFactory, $this->app);
+            return new PidManager(
+                $this->app->make('config')->get('swoole_http.server.options.pid_file')
+            );
         });
     }
 
@@ -150,7 +151,7 @@ protected function createSwooleServer()
         $host = $config->get('swoole_http.server.host');
         $port = $config->get('swoole_http.server.port');
         $socketType = $config->get('swoole_http.server.socket_type', SWOOLE_SOCK_TCP);
-        $processType = $config->get('swoole.http.server.process_type', SWOOLE_PROCESS);
+        $processType = $config->get('swoole_http.server.process_type', SWOOLE_PROCESS);
 
         static::$server = new $server($host, $port, $processType, $socketType);
     }

src/LaravelServiceProvider.php

@@ -2,10 +2,9 @@
 
 namespace SwooleTW\Http;
 
+use SwooleTW\Http\Server\Manager;
 use Illuminate\Contracts\Http\Kernel;
 use SwooleTW\Http\Middleware\AccessLog;
-use SwooleTW\Http\Server\Manager;
-use SwooleTW\Http\Server\PidManager;
 
 /**
  * @codeCoverageIgnore
@@ -20,7 +19,7 @@ class LaravelServiceProvider extends HttpServiceProvider
     protected function registerManager()
     {
         $this->app->singleton(Manager::class, function ($app) {
-            return new Manager($app, 'laravel', base_path(), $this->app[PidManager::class]);
+            return new Manager($app, 'laravel');
         });
 
         $this->app->alias(Manager::class, 'swoole.manager');

src/LumenServiceProvider.php

@@ -2,9 +2,8 @@
 
 namespace SwooleTW\Http;
 
-use SwooleTW\Http\Middleware\AccessLog;
 use SwooleTW\Http\Server\Manager;
-use SwooleTW\Http\Server\PidManager;
+use SwooleTW\Http\Middleware\AccessLog;
 
 /**
  * @codeCoverageIgnore
@@ -19,7 +18,7 @@ class LumenServiceProvider extends HttpServiceProvider
     protected function registerManager()
     {
         $this->app->singleton(Manager::class, function ($app) {
-            return new Manager($app, 'lumen', base_path(), $this->app[PidManager::class]);
+            return new Manager($app, 'lumen');
         });
 
         $this->app->alias(Manager::class, 'swoole.manager');

src/Server/Manager.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Str;
 use SwooleTW\Http\Helpers\OS;
 use SwooleTW\Http\Server\Sandbox;
+use SwooleTW\Http\Server\PidManager;
 use SwooleTW\Http\Task\SwooleTaskJob;
 use Illuminate\Support\Facades\Facade;
 use SwooleTW\Http\Websocket\Websocket;
@@ -41,13 +42,6 @@ class Manager
      */
     protected $container;
 
-    /**
-     * A manager to handle pid about the application.
-     *
-     * @var PidManager
-     */
-    protected $pidManager;
-
     /**
      * @var string
      */
@@ -89,12 +83,11 @@ class Manager
      *
      * @throws \Exception
      */
-    public function __construct(Container $container, $framework, $basePath = null, PidManager $pidManager)
+    public function __construct(Container $container, $framework, $basePath = null)
     {
         $this->container = $container;
         $this->setFramework($framework);
         $this->setBasepath($basePath);
-        $this->pidManager = $pidManager;
         $this->initialize();
     }
 
@@ -147,8 +140,7 @@ public function onStart()
         $this->setProcessName('master process');
 
         $server = $this->container->make(Server::class);
-
-        $this->pidManager->write($server->master_pid, $server->manager_pid ?? 0);
+        $this->container->make(PidManager::class)->write($server->master_pid, $server->manager_pid ?? 0);
 
         $this->container->make('events')->dispatch('swoole.start', func_get_args());
     }
@@ -310,7 +302,7 @@ public function onFinish($server, $taskId, $data)
      */
     public function onShutdown()
     {
-        $this->pidManager->delete();
+        $this->container->make(PidManager::class)->delete();
     }
 
     /**