feat: add scheduler and disconnect config

Author: mychidarko

src/Queue/Adapters/Adapter.php

@@ -56,4 +56,9 @@ public function markJobAsFailed($id);
      * Retry failed job
      */
     public function retryFailedJob($id, $retryCount);
+
+    /**
+     * Disconnect
+     */
+    public function disconnect();
 }

src/Queue/Adapters/Database.php

@@ -41,6 +41,7 @@ public function connect($connection)
         ]);
 
         $this->config['table'] = $connection['table'] ?? 'leaf_php_jobs';
+        $this->config['schedule.table'] = $connection['schedule.table'] ?? 'leaf_php_schedules';
 
         return $this;
     }
@@ -72,7 +73,7 @@ public function popJobFromQueue($id)
         $this->db
             ->delete($this->config['table'])
             ->where([
-                'id' => $id,
+                "id" => $id,
             ])
             ->execute();
 
@@ -150,11 +151,11 @@ public function retryFailedJob($id, $retryCount)
         $this->db
             ->update($this->config['table'])
             ->params([
-                'status' => 'pending',
-                'retry_count' => (int) $retryCount + 1,
+                "status" => "pending",
+                "retry_count" => (int) $retryCount + 1,
             ])
             ->where([
-                'id' => $id,
+                "id" => $id,
             ])
             ->execute();
 
@@ -166,4 +167,12 @@ public function retryFailedJob($id, $retryCount)
 
         return true;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function disconnect()
+    {
+        $this->db->close();
+    }
 }

src/Queue/Adapters/Redis.php

@@ -27,6 +27,7 @@ public function __construct()
     public function connect($connection)
     {
         $this->config['table'] = $connection['table'] ?? 'leaf_php_jobs';
+        $this->config['schedule.table'] = $connection['schedule.table'] ?? 'leaf_php_schedules';
 
         if (redis()->ping()) {
             $this->redis = redis();
@@ -183,4 +184,12 @@ public static function v4()
             \mt_rand(0, 0xffff)
         );
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function disconnect()
+    {
+        $this->redis->close();
+    }
 }

src/Queue/Commands/QueueWorkCommand.php

@@ -31,17 +31,24 @@ protected function handle()
                 $this->writeln("> Queue table not found. Creating queue table...");
 
                 \Leaf\FS\File::copy(__DIR__ . '/stubs/schema.yml', DatabasePath("{$this->queueConfig['connections'][$queue]['table']}.yml"));
+                \Leaf\FS\File::copy(__DIR__ . '/stubs/schedules.yml', DatabasePath("{$this->queueConfig['connections'][$queue]['schedules.table']}.yml"));
+
                 \Aloe\Core::run(
                     "php leaf db:migrate {$this->queueConfig['connections'][$queue]['table']}",
                     $this->output
                 );
+                \Aloe\Core::run(
+                    "php leaf db:migrate {$this->queueConfig['connections'][$queue]['schedules.table']}",
+                    $this->output
+                );
             }
         } else {
             $this->writeln('> Using redis connection for queue...');
         }
 
         (new \Leaf\Worker())
             ->queue($this->queueConfig['connections'][$queue])
+            ->scheduler($this->queueConfig['connections'][$queue])
             ->run();
 
         return 0;