Exeptions for alredy running and not running master process

luzrain · Sep 17, 2024 · d6986ca · d6986ca
1 parent 6ad15ae
commit d6986ca
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 11 deletions.
diff --git a/src/Exception/AlreadyRunningException.php b/src/Exception/AlreadyRunningException.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Luzrain\PHPStreamServer\Exception;
+
+use Luzrain\PHPStreamServer\Server;
+
+final class AlreadyRunningException extends \RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct(\sprintf('%s already running', Server::NAME));
+    }
+}
diff --git a/src/Exception/NotRunningException.php b/src/Exception/NotRunningException.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Luzrain\PHPStreamServer\Exception;
+
+use Luzrain\PHPStreamServer\Server;
+
+final class NotRunningException extends \RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct(\sprintf('%s is not running', Server::NAME));
+    }
+}
diff --git a/src/Internal/MasterProcess.php b/src/Internal/MasterProcess.php
@@ -5,6 +5,8 @@
 namespace Luzrain\PHPStreamServer\Internal;
 
 use Luzrain\PHPStreamServer\Console\StdoutHandler;
+use Luzrain\PHPStreamServer\Exception\AlreadyRunningException;
+use Luzrain\PHPStreamServer\Exception\NotRunningException;
 use Luzrain\PHPStreamServer\Exception\PHPStreamServerException;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageHandler;
 use Luzrain\PHPStreamServer\Internal\MessageBus\SocketFileMessageBus;
@@ -102,8 +104,7 @@ public function addPlugin(Plugin ...$plugins): void
     public function run(bool $daemonize = false): int
     {
         if ($this->isRunning()) {
-            $this->logger->error('Master process already running');
-            return 1;
+            throw new AlreadyRunningException();
         }
 
         if ($daemonize && $this->doDaemonize()) {
@@ -229,8 +230,7 @@ private function onMasterShutdown(): void
     public function stop(int $code = 0): void
     {
         if (!$this->isRunning()) {
-            $this->logger->error(Server::NAME . ' is not running');
-            return;
+            throw new NotRunningException();
         }
 
         // If it called from outside working process
@@ -263,8 +263,7 @@ public function stop(int $code = 0): void
     public function reload(): void
     {
         if (!$this->isRunning()) {
-            $this->logger->error(Server::NAME . ' is not running');
-            return;
+            throw new NotRunningException();
         }
 
         // If it called from outside working process

diff --git a/src/Plugin/System/Command/ConnectionsCommand.php b/src/Plugin/System/Command/ConnectionsCommand.php
@@ -24,7 +24,6 @@ public function execute(Options $options): int
             \array_push($connections, ...$process->connections);
         }
 
-
         echo "❯ Connections\n";
 
         if (\count($connections) > 0) {

diff --git a/src/Plugin/System/Command/ReloadCommand.php b/src/Plugin/System/Command/ReloadCommand.php
@@ -6,6 +6,7 @@
 
 use Luzrain\PHPStreamServer\Console\Command;
 use Luzrain\PHPStreamServer\Console\Options;
+use Luzrain\PHPStreamServer\Exception\NotRunningException;
 
 final class ReloadCommand extends Command
 {
@@ -14,7 +15,12 @@ final class ReloadCommand extends Command
 
     public function execute(Options $options): int
     {
-        $this->masterProcess->reload();
+        try {
+            $this->masterProcess->reload();
+        } catch (NotRunningException $e) {
+            echo \sprintf("<color;bg=red>%s</>\n", $e->getMessage());
+            return 1;
+        }
 
         return 0;
     }

diff --git a/src/Plugin/System/Command/StartCommand.php b/src/Plugin/System/Command/StartCommand.php
@@ -7,6 +7,7 @@
 use Luzrain\PHPStreamServer\Console\Command;
 use Luzrain\PHPStreamServer\Console\Options;
 use Luzrain\PHPStreamServer\Console\Table;
+use Luzrain\PHPStreamServer\Exception\AlreadyRunningException;
 use Luzrain\PHPStreamServer\Internal\ServerStatus\ServerStatus;
 use Luzrain\PHPStreamServer\Internal\ServerStatus\WorkerProcessInfo;
 use Luzrain\PHPStreamServer\Server;
@@ -63,6 +64,11 @@ public function execute(Options $options): int
             echo "Press Ctrl+C to stop.\n";
         }
 
-        return $this->masterProcess->run($isDaemon);
+        try {
+            return $this->masterProcess->run($isDaemon);
+        } catch (AlreadyRunningException $e) {
+            echo \sprintf("<color;bg=red>%s</>\n", $e->getMessage());
+            return 1;
+        }
     }
 }
diff --git a/src/Plugin/System/Command/StopCommand.php b/src/Plugin/System/Command/StopCommand.php
@@ -6,6 +6,7 @@
 
 use Luzrain\PHPStreamServer\Console\Command;
 use Luzrain\PHPStreamServer\Console\Options;
+use Luzrain\PHPStreamServer\Exception\NotRunningException;
 
 final class StopCommand extends Command
 {
@@ -14,8 +15,12 @@ final class StopCommand extends Command
 
     public function execute(Options $options): int
     {
-        // TODO: throw excepton if server already runs
-        $this->masterProcess->stop();
+        try {
+            $this->masterProcess->stop();
+        } catch (NotRunningException $e) {
+            echo \sprintf("<color;bg=red>%s</>\n", $e->getMessage());
+            return 1;
+        }
 
         return 0;
     }