Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 00:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Sentinel timeouts

Browse Source
This commit is contained in:
David Bomba 2021-11-11 11:35:58 +11:00
parent 906f2b30a4
commit f5ea8a83f0
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ImportController.php
View File

@ -83,7 +83,7 @@ class ImportController extends Controller {
$contents = file_get_contents( $file->getPathname() ); $contents = file_get_contents( $file->getPathname() );
// Store the csv in cache with an expiry of 10 minutes // Store the csv in cache with an expiry of 10 minutes
Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 3600 ); Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 600 );
// Parse CSV // Parse CSV
$csv_array = $this->getCsvData( $contents ); $csv_array = $this->getCsvData( $contents );
@ -111,7 +111,7 @@ class ImportController extends Controller {
$contents = file_get_contents( $file->getPathname() ); $contents = file_get_contents( $file->getPathname() );
// Store the csv in cache with an expiry of 10 minutes // Store the csv in cache with an expiry of 10 minutes
Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 3600 ); Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 600 );
} }
} }

2
app/Jobs/Import/CSVImport.php
View File

@ -587,7 +587,7 @@ class CSVImport implements ShouldQueue {
} }
private function getCsvData( $entityType ) { private function getCsvData( $entityType ) {
$base64_encoded_csv = Cache::get( $this->hash . '-' . $entityType ); $base64_encoded_csv = Cache::pull( $this->hash . '-' . $entityType );
if ( empty( $base64_encoded_csv ) ) { if ( empty( $base64_encoded_csv ) ) {
return null; return null;
} }

9
app/Listeners/Invoice/InvoiceCreatedNotification.php
View File

@ -52,6 +52,10 @@ class InvoiceCreatedNotification implements ShouldQueue
/* The User */ /* The User */
$user = $company_user->user; $user = $company_user->user;
if(!$user)
continue;
/* This is only here to handle the alternate message channels - ie Slack */ /* This is only here to handle the alternate message channels - ie Slack */
// $notification = new EntitySentNotification($event->invitation, 'invoice'); // $notification = new EntitySentNotification($event->invitation, 'invoice');
@ -71,11 +75,6 @@ class InvoiceCreatedNotification implements ShouldQueue
} }
/* Override the methods in the Notification Class */
// $notification->method = $methods;
// Notify on the alternate channels
// $user->notify($notification);
} }
} }
} }

3
app/Listeners/Quote/QuoteCreatedNotification.php
View File

@ -53,6 +53,9 @@ class QuoteCreatedNotification implements ShouldQueue
/* The User */ /* The User */
$user = $company_user->user; $user = $company_user->user;
if(!$user)
continue;
/* This is only here to handle the alternate message channels - ie Slack */ /* This is only here to handle the alternate message channels - ie Slack */
// $notification = new EntitySentNotification($event->invitation, 'quote'); // $notification = new EntitySentNotification($event->invitation, 'quote');

4
config/database.php
View File

@ -207,7 +207,7 @@ return [
['options' => [ ['options' => [
'replication' => 'sentinel', 'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'sentinel_timeout' => 1.0, 'sentinel_timeout' => 2.0,
'parameters' => [ 'parameters' => [
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'database' => env('REDIS_DB', 0), 'database' => env('REDIS_DB', 0),
@ -226,7 +226,7 @@ return [
['options' => [ ['options' => [
'replication' => 'sentinel', 'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'), 'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'sentinel_timeout' => 1.0, 'sentinel_timeout' => 2.0,
'parameters' => [ 'parameters' => [
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'database' => env('REDIS_CACHE_DB', 1), 'database' => env('REDIS_CACHE_DB', 1),