Various fixes

Author: barryvdh

src/AsyncQueue.php

@@ -1,7 +1,9 @@
 <?php
 namespace Barryvdh\Queue;
 
+use Illuminate\Database\Connection;
 use Illuminate\Queue\DatabaseQueue;
+use Illuminate\Queue\DatabaseQueue\DatabaseJob;
 
 class AsyncQueue extends DatabaseQueue
 {
@@ -99,7 +101,7 @@ public function release($queue, $job, $delay)
 	 * @param  string|null  $queue
 	 * @return \StdClass|null
 	 */
-	protected function getJobFromId($queue, $id)
+	public function getJobFromId($queue, $id)
 	{
 		$this->database->beginTransaction();
 		$job = $this->database->table($this->table)
@@ -142,13 +144,14 @@ public function startProcess($queue, $id)
      */
     protected function getCommand($queue, $id)
     {
+        $connection = null;
         $cmd = '%s artisan queue:async %d %d --env=%s --queue=%s';
         $cmd = $this->getBackgroundCommand($cmd);
 
         $binary = $this->getPhpBinary();
         $environment = $this->container->environment();
 
-        return sprintf($cmd, $binary, $jobId, $environment, $queue);
+        return sprintf($cmd, $binary, $id, $connection, $environment, $queue);
     }
 
     /**
@@ -158,7 +161,7 @@ protected function getCommand($queue, $id)
      */
     protected function getPhpBinary()
     {
-        $path = escapeshellarg($thisbinary);
+        $path = escapeshellarg($this->binary);
         if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
             $path = escapeshellarg($path);
         }

src/AsyncServiceProvider.php

@@ -46,7 +46,7 @@ public function register()
     protected function registerAsyncCommand()
     {
         $this->app->singleton('command.queue.async', function () {
-             return new AsyncCommand($this->app['command.queue.work']);
+             return new AsyncCommand($this->app['queue.worker']);
         });
     }
 

src/Connectors/AsyncConnector.php

@@ -5,7 +5,7 @@
 use Barryvdh\Queue\AsyncQueue;
 use Illuminate\Queue\Connectors\DatabaseConnector;
 
-class AsyncConnector implements DatabaseConnector
+class AsyncConnector extends DatabaseConnector
 {
 
     /**

src/Console/AsyncCommand.php

@@ -50,24 +50,29 @@ public function __construct(Worker $worker)
     public function fire()
     {
         $queue = $this->option('queue');
+        
+        
         $id = $this->argument('id');
         $connection = $this->argument('connection');
+        $delay = $this->option('delay');
         $tries = $this->option('tries');
 
         $this->processJob(
-			$connection, $queue, $delay, $tries
+			$connection, $queue, $id, $delay, $tries
 		);
     }
 
+    
     /**
      *  Process the job
      * 
      */
-    protected function processJob($connectionName, $queue, $delay, $maxTries)
+    protected function processJob($connectionName, $queue, $id, $delay, $maxTries)
     {
         $connection = $this->worker->getManager()->connection($connectionName);
 
-		$job = $this->queue->getJobFromId($queue, $id);
+		$job = $connection->getJobFromId($queue, $id);
+		
 		// If we're able to pull a job off of the stack, we will process it and
 		// then immediately return back out. If there is no job on the queue
 		// we will "sleep" the worker for the specified number of seconds.
@@ -107,6 +112,8 @@ protected function getOptions()
             array('queue', null, InputOption::VALUE_OPTIONAL, 'The queue name', null),
 
             array('delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0),
+            
+            array('tries', null, InputOption::VALUE_OPTIONAL, 'Number of times to attempt a job before logging it failed', 0),
         );
     }
 }