diff --git a/app/Console/Commands/RunTasks.php b/app/Console/Commands/RunTasks.php index cb69cc15c..351dabd68 100644 --- a/app/Console/Commands/RunTasks.php +++ b/app/Console/Commands/RunTasks.php @@ -67,7 +67,7 @@ class RunTasks extends Command */ public function handle() { - $tasks = Models\Task::where('queued', 0)->where('suspended', 0)->where('next_run', '<=', (Carbon::now())->toAtomString())->get(); + $tasks = Models\Task::where('queued', 0)->where('active', 1)->where('next_run', '<=', (Carbon::now())->toAtomString())->get(); $this->info(sprintf('Preparing to queue %d tasks.', count($tasks))); $bar = $this->output->createProgressBar(count($tasks)); diff --git a/app/Jobs/SendScheduledTask.php b/app/Jobs/SendScheduledTask.php index d8348a583..96d4a669a 100644 --- a/app/Jobs/SendScheduledTask.php +++ b/app/Jobs/SendScheduledTask.php @@ -93,7 +93,6 @@ class SendScheduledTask extends Job implements ShouldQueue 'run_status' => 1, 'response' => $ex->getMessage() ]); - throw $ex; } finally { $cron = Cron::factory(sprintf('%s %s %s %s %s %s', $this->task->minute,