update

workbunny · Aug 19, 2024 · a67a11e · a67a11e
1 parent 3c11f90
commit a67a11e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Builders/AbstractBuilder.php b/src/Builders/AbstractBuilder.php
@@ -44,6 +44,7 @@ abstract class AbstractBuilder
 
     public function __construct()
     {
+        $this->setBuilderName(get_called_class());
         $config = config('plugin.workbunny.webman-rabbitmq.app');
         self::$reuseConnection = $config['reuse_connection'] ?? false;
         $this->setConnection(new Connection($config));
@@ -67,10 +68,9 @@ public static function isReuseConnection(): bool
      */
     public static function instance(): AbstractBuilder
     {
-        if(!isset(self::$_builders[$class = get_called_class()])){
+        if (!(self::$_builders[$class = get_called_class()] ?? null)) {
             self::$_builders[$class] = new $class();
         }
-        self::$_builders[$class]->setBuilderName($class);
         return self::$_builders[$class];
     }
 

diff --git a/src/Builders/QueueBuilder.php b/src/Builders/QueueBuilder.php
@@ -4,6 +4,7 @@
 
 use Bunny\Exception\ClientException;
 use Workbunny\WebmanRabbitMQ\Constants;
+use Workbunny\WebmanRabbitMQ\Exceptions\WebmanRabbitMQException;
 use Workerman\Worker;
 use Bunny\Channel as BunnyChannel;
 use Bunny\Async\Client as BunnyClient;
@@ -62,7 +63,7 @@ public function onWorkerStart(Worker $worker): void
     {
         try {
             $this->getConnection()?->consume($this->getBuilderConfig());
-        } catch (ClientException $exception) {
+        } catch (ClientException|WebmanRabbitMQException $exception) {
             $worker::log("Queue $worker->id exception: [{$exception->getCode()}] {$exception->getMessage()}, \n");
             sleep($this->restartInterval);
             $worker::stopAll();