Move delay to command

Author: barryvdh

src/AsyncQueue.php

@@ -28,10 +28,10 @@ public function __construct(array $config)
      */
     public function push($job, $data = '', $queue = null)
     {
-        $id = $this->storeJob($job, $data);
+        $id = $this->storeJob($job, $data, 0);
         $this->startProcess($id, 0);
 
-        return 0;
+        return $id;
     }
 
     /**
@@ -62,31 +62,33 @@ public function storeJob($job, $data, $delay = 0)
      * Make a Process for the Artisan command for the job id.
      *
      * @param int $jobId
+     * @param int $delay
      *
      * @return void
      */
-    public function startProcess($jobId)
+    public function startProcess($jobId, $delay = 0)
     {
         chdir($this->container['path.base']);
-        exec($this->getCommand($jobId));
+        exec($this->getCommand($jobId, $delay));
     }
 
     /**
      * Get the Artisan command as a string for the job id.
      *
      * @param int $jobId
+     * @param int $delay
      *
      * @return string
      */
-    protected function getCommand($jobId)
+    protected function getCommand($jobId, $delay = 0)
     {
-        $cmd = '%s artisan queue:async %d --env=%s';
+        $cmd = '%s artisan queue:async %d --env=%s --delay=%d';
         $cmd = $this->getBackgroundCommand($cmd);
 
         $binary = $this->getPhpBinary();
         $environment = $this->container->environment();
 
-        return sprintf($cmd, $binary, $jobId, $environment);
+        return sprintf($cmd, $binary, $jobId, $environment, $delay);
     }
 
     /**
@@ -127,9 +129,9 @@ public function later($delay, $job, $data = '', $queue = null)
     {
         $delay = $this->getSeconds($delay);
         $id = $this->storeJob($job, $data, $delay);
-        $this->startProcess($id);
+        $this->startProcess($id, $delay);
 
-        return 0;
+        return $id;
     }
 
 }

src/Console/AsyncCommand.php

@@ -6,6 +6,7 @@
 use Barryvdh\Queue\Models\Job;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class AsyncCommand extends Command
 {
@@ -32,6 +33,10 @@ public function fire()
     {
         $item = Job::findOrFail($this->argument('job_id'));
 
+        if ($delay = (int) $this->option('delay')) {
+            sleep($delay);
+        }
+
         $job = new AsyncJob($this->laravel, $item);
 
         $job->fire();
@@ -48,4 +53,16 @@ protected function getArguments()
             array('job_id', InputArgument::REQUIRED, 'The Job ID'),
         );
     }
+
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return array(
+            array('delay', 'D', InputOption::VALUE_OPTIONAL, 'The delay in seconds', 0),
+        );
+    }
 }

src/Jobs/AsyncJob.php

@@ -37,13 +37,6 @@ public function fire()
         // Get the payload from the job
         $payload = $this->parsePayload($this->getRawBody());
 
-        // If we have to wait, sleep until our time has come
-        if ($this->job->delay && $this->attempts() == 0) {
-            $this->job->status = Job::STATUS_WAITING;
-            $this->job->save();
-            sleep($this->job->delay);
-        }
-
         // Mark job as started
         $this->job->status = Job::STATUS_STARTED;
         $this->job->retries++;