cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/51.4-explore-multiple-queues' into 'master'

Browse Source 
Update info log location and queue with high_priority for processing job faster

See merge request CIEFWorldwideSdnBhd/exchange-2.0!160
This commit is contained in:
Dillon Ngo
2024-03-18 12:10:50 +00:00
parent 04689864f3 15482469a6
commit 8ac29fff76
30 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Abstracts/AbstractControllerLogic.php
+1 -1
View File
@@ -69,7 +69,7 @@ abstract class AbstractControllerLogic
} catch (ErrorException|GeneralExceptions $exception){
if ($exception instanceof JobResourceNotFoundException) {
Log::error(sprintf(
Log::channel('vue_polling')->info(sprintf(
"Uncaught exception '%s' with message '%s' in %s:%d",
get_class($exception),
$exception->getMessage(),
app/Classes/Jobs/UpdatePerfexCRMInvoice.php
+3 -4
View File
@@ -57,16 +57,15 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
$number = 'EXC-'.$number;
$invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $number);
Log::error(json_encode('UpdatePerfexCRMInvoice debug $number: '.$number));
Log::channel('perfex_crm')->info(('UpdatePerfexCRMInvoice debug $number: '.$number));
if(is_null($invoice)){
$result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction);
if ($result) {
$invoiceId = $result->payload['id'];
} else {
// Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
$log['message'] = 'UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed';
Helper::debugLogger($log);
Log::channel('perfex_crm')->info($log);
}
}
else{
@@ -75,7 +74,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
//This only run when invoice already exist and the invoice does not have a PAID status
if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId());
//update invoice
(App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
+1 -1
View File
@@ -62,7 +62,7 @@ class ListBookingJobLogic extends AbstractControllerLogic
$userInfo
);
ListBookingsJob::dispatch($listGenericJobObject);
ListBookingsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
$result = [];
$result['job_id'] = $jobId;
app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
+1 -1
View File
@@ -63,7 +63,7 @@ class ListDocumentJobLogic extends AbstractControllerLogic
$userInfo
);
ListDocumentsJob::dispatch($listGenericJobObject);
ListDocumentsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
$result = [];
$result['job_id'] = $jobId;
app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php
+2 -2
View File
@@ -108,12 +108,12 @@ class CreatePerfexCRMInvoiceProcessor
$email = null;
if ($firstSupplier) {
$email = $firstSupplier->email;
Log::error('CreatePerfexCRMInvoiceProcessor debug:'.$email);
Log::channel('perfex_crm')->info('CreatePerfexCRMInvoiceProcessor debug:'.$email);
} else {
$bookingMarking = $transaction->owner->marking;
$serviceTypeName = $transaction->owner->company->services()->where('id', $transaction->owner->service_id)->first()->name;
$projectName = 'Exchange | '.$serviceTypeName.' | '.$bookingMarking;
Log::error('$projectName: '.$projectName);
Log::channel('perfex_crm')->info('$projectName: '.$projectName);
return $email;
}
app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php
+1 -1
View File
@@ -62,7 +62,7 @@ class FetchPerfexCRMInvoiceProcessor
$invoiceId = $result->payload['id'];
} else {
$log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
Helper::debugLogger($log);
Log::channel('perfex_crm')->info($log);
}
}
else{
app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
+2 -2
View File
@@ -217,8 +217,8 @@ class UpdatePerfexCRMProcessor
}
$result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());
// Log::error("UpdatePerfexCRMProcessor task: ".$taskName." , ".json_encode($result));
Log::error("UpdatePerfexCRMProcessor task: ".$taskName);
// Log::channel('perfex_crm')->info("UpdatePerfexCRMProcessor task: ".$taskName." , ".json_encode($result));
Log::channel('perfex_crm')->info("UpdatePerfexCRMProcessor task: ".$taskName);
if(isset($result->payload)){
//&& $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED
app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php
+1 -1
View File
@@ -24,7 +24,7 @@ class ConvertsPerfexCRMLeadToCustomer
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php
+1 -1
View File
@@ -27,7 +27,7 @@ class CreatesPerfexCRMCustomer
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php
+1 -1
View File
@@ -34,7 +34,7 @@ class CreatesPerfexCRMCustomerContact
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php
+1 -1
View File
@@ -33,7 +33,7 @@ class CreatesPerfexCRMCustomerProject
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php
+1 -1
View File
@@ -53,7 +53,7 @@ class CreatesPerfexCRMInvoice
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php
+1 -1
View File
@@ -33,7 +33,7 @@ class CreatesPerfexCRMInvoicePayment
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php
+1 -1
View File
@@ -40,7 +40,7 @@ class CreatesPerfexCRMLead
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php
+1 -1
View File
@@ -36,7 +36,7 @@ class CreatesPerfexCRMMilestone
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php
+1 -1
View File
@@ -56,7 +56,7 @@ class CreatesPerfexCRMTask
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
+1 -1
View File
@@ -24,7 +24,7 @@ class FetchesPerfexCRMCustomer
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php
+1 -1
View File
@@ -26,7 +26,7 @@ class FetchesPerfexCRMInvoice
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php
+1 -1
View File
@@ -24,7 +24,7 @@ class FetchesPerfexCRMLead
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php
+1 -1
View File
@@ -30,7 +30,7 @@ class FetchesPerfexCRMMilestone
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php
+1 -1
View File
@@ -30,7 +30,7 @@ class FetchesPerfexCRMProject
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
+1 -1
View File
@@ -44,7 +44,7 @@ class FetchesPerfexCRMTask
return (object) $data;
}else{
Helper::debugLogger($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
+1 -1
View File
@@ -38,7 +38,7 @@ class UpdatesPerfexCRMCustomer
$data = $response->json();
return (object) $data;
}else{
Helper::debugLogger($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php
+1 -1
View File
@@ -60,7 +60,7 @@ class UpdatesPerfexCRMInvoice
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php
+1 -1
View File
@@ -41,7 +41,7 @@ class UpdatesPerfexCRMLead
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php
+1 -1
View File
@@ -33,7 +33,7 @@ class UpdatesPerfexCRMProject
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
+1 -1
View File
@@ -40,7 +40,7 @@ class UpdatesPerfexCRMTask
$data = $response->json();
return (object) $data;
}else{
Log::error($response);
Log::channel('perfex_crm')->info($response);
return null;
}
}catch(\Exception $exception){
app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
+1 -1
View File
@@ -61,7 +61,7 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
$userInfo
);
ListTransactionsJob::dispatch($listGenericJobObject);
ListTransactionsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
$result = [];
$result['job_id'] = $jobId;
config/logging.php
+13
View File
@@ -108,6 +108,19 @@ return [
'driver' => 'errorlog',
'level' => 'debug',
],
'vue_polling' => [
'driver' => 'single',
'path' => storage_path('logs/laravel_vue_plling.log'),
'level' => 'info',
],
'perfex_crm' => [
'driver' => 'single',
'path' => storage_path('logs/laravel_perfex_crm.log'),
'level' => 'info',
],
],
];
config/queue.php
+7
View File
@@ -34,6 +34,13 @@ return [
'driver' => 'sync',
],
'high_priority' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'high_priority',
'retry_after' => 90,
],
'database' => [
'driver' => 'database',
'table' => 'jobs',