From a0c4c619b01da155dc90d4d4ca94154a22c25c77 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 5 May 2019 01:39:06 -0500 Subject: [PATCH] added some unnecessary stuff to jobs --- app/Jobs/ProcessWalletJournalJob.php | 19 +------- app/Jobs/ProcessWallettransactionJob.php | 22 +-------- app/Jobs/SendEveMailJob.php | 19 +------- ..._05_05_044159_create_jobs_status_table.php | 45 ------------------- 4 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 database/migrations/2019_05_05_044159_create_jobs_status_table.php diff --git a/app/Jobs/ProcessWalletJournalJob.php b/app/Jobs/ProcessWalletJournalJob.php index 2ca19843b..a873c39d0 100644 --- a/app/Jobs/ProcessWalletJournalJob.php +++ b/app/Jobs/ProcessWalletJournalJob.php @@ -63,12 +63,6 @@ class ProcessWalletJournalJob implements ShouldQueue $finance->GetWalletJournalPage($this->division, $this->charId, $this->page); - //If the job is completed, mark down the completed job in the status table for jobs - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = true; - $job->save(); - //After the job is completed, delete the job $this->delete(); } @@ -81,17 +75,6 @@ class ProcessWalletJournalJob implements ShouldQueue */ public function failed($exception) { - //Save the error in the database - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = false; - $job->save(); - - //Save the job error - $error = new JobError; - $error->job_id = $job->id; - $error->job_name = $this->getName(); - $error->error = $exception; - $error->save(); + dd($exception); } } diff --git a/app/Jobs/ProcessWallettransactionJob.php b/app/Jobs/ProcessWallettransactionJob.php index cb18a2490..a0ce2955e 100644 --- a/app/Jobs/ProcessWallettransactionJob.php +++ b/app/Jobs/ProcessWallettransactionJob.php @@ -42,8 +42,7 @@ class ProcessWalletTransactionJob implements ShouldQueue { $this->division = $pwt->division; $this->charId = $pwt->charId; - - $this->delay = 10; + $this->connection = 'database'; } @@ -59,12 +58,6 @@ class ProcessWalletTransactionJob implements ShouldQueue $finance->GetWalletTransaction($this->division, $this->charId); - //If the job is completed, mark down the completed job in the status table for jobs - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = true; - $job->save(); - //After the job is completed, delete the job $this->delete(); } @@ -76,17 +69,6 @@ class ProcessWalletTransactionJob implements ShouldQueue * @return void */ public function failed($exception) { - //Save the error in the database - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = false; - $job->save(); - - //Save the job error - $error = new JobError; - $error->job_id = $job->id; - $error->job_name = $this->getName(); - $error->error = $exception; - $error->save(); + dd($exception); } } diff --git a/app/Jobs/SendEveMailJob.php b/app/Jobs/SendEveMailJob.php index cd4521df8..be0411708 100644 --- a/app/Jobs/SendEveMailJob.php +++ b/app/Jobs/SendEveMailJob.php @@ -99,12 +99,6 @@ class SendEveMailJob implements ShouldQueue } catch(RequestFailedException $e) { return null; } - - //If the job is completed, mark down the completed job in the status table for jobs - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = true; - $job->save(); $this->delete(); } @@ -117,17 +111,6 @@ class SendEveMailJob implements ShouldQueue */ public function failed($exception) { - //Save the error in the database - $job = new JobStatus; - $job->job_name = $this->getName(); - $job->complete = false; - $job->save(); - - //Save the job error - $error = new JobError; - $error->job_id = $job->id; - $error->job_name = $this->getName(); - $error->error = $exception; - $error->save(); + dd($exception); } } diff --git a/database/migrations/2019_05_05_044159_create_jobs_status_table.php b/database/migrations/2019_05_05_044159_create_jobs_status_table.php deleted file mode 100644 index e68b75f61..000000000 --- a/database/migrations/2019_05_05_044159_create_jobs_status_table.php +++ /dev/null @@ -1,45 +0,0 @@ -increments('id'); - $table->string('job_name'); - $table->boolean('complete')->default(false); - $table->timestamps(); - }); - } - - if(!Schema::hasTable('jobs_errors')) { - Schema::create('jobs_errors', function(Blueprint $table) { - $table->integer('job_id'); - $table->string('job_name'); - $table->text('error'); - $table->timestamps(); - }); - } - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('jobs_status'); - Schema::dropIfExists('jobs_errors'); - } -}