Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 05:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Redis pipelines

Browse Source
This commit is contained in:
David Bomba 2023-03-09 15:45:37 +11:00
parent a18e55e1d1
commit a7c230e3b6
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/Jobs/Ninja/AdjustEmailQuota.php
View File

@ -22,7 +22,7 @@ use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Turbo124\Beacon\Facades\LightLogs; use Turbo124\Beacon\Facades\LightLogs;
use Illuminate\Support\Facades\Redis;
class AdjustEmailQuota implements ShouldQueue class AdjustEmailQuota implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@ -61,18 +61,47 @@ class AdjustEmailQuota implements ShouldQueue
Account::query()->cursor()->each(function ($account) { Account::query()->cursor()->each(function ($account) {
nlog("resetting email quota for {$account->key}"); nlog("resetting email quota for {$account->key}");
$email_count = Cache::get($account->key); $email_count = Cache::get("email_quota".$account->key);
if ($email_count > 0) { if ($email_count > 0) {
try { try {
LightLogs::create(new EmailCount($email_count, $account->key))->send(); LightLogs::create(new EmailCount($email_count, $account->key))->send(); // this runs syncronously
} catch(\Exception $e) { } catch(\Exception $e) {
nlog($e->getMessage()); nlog($e->getMessage());
} }
} }
Cache::forget($account->key);
Cache::forget("throttle_notified:{$account->key}");
}); });
/** Use redis pipelines to execute bulk deletes efficiently */
$redis = Redis::connection('sentinel-cache');
$prefix = config('cache.prefix'). ":email_quota*";
$keys = $redis->keys($prefix);
if(is_array($keys))
{
$redis->pipeline(function ($pipe) use ($keys) {
foreach ($keys as $key) {
$pipe->del($key);
}
});
}
$keys = null;
$prefix = config('cache.prefix'). ":throttle_notified*";
$keys = $redis->keys($prefix);
if (is_array($keys)) {
$redis->pipeline(function ($pipe) use ($keys) {
foreach ($keys as $key) {
$pipe->del($key);
}
});
}
} }
} }

9
app/Models/Account.php
View File

@ -339,7 +339,8 @@ class Account extends BaseModel
return false; return false;
} }
if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now())) { // 09-03-2023 - winds forward expiry checks to ensure we don't cut off users prior to billing cycle being commenced
if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now()->subHours(12))) {
return false; return false;
} }
@ -352,7 +353,7 @@ class Account extends BaseModel
return false; return false;
} }
if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now())) { if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now()->subHours(12))) {
return true; return true;
} }
@ -526,12 +527,12 @@ class Account extends BaseModel
public function emailQuotaExceeded() :bool public function emailQuotaExceeded() :bool
{ {
if (is_null(Cache::get($this->key))) { if (is_null(Cache::get("email_quota".$this->key))) {
return false; return false;
} }
try { try {
if (Cache::get($this->key) > $this->getDailyEmailLimit()) { if (Cache::get("email_quota".$this->key) > $this->getDailyEmailLimit()) {
if (is_null(Cache::get("throttle_notified:{$this->key}"))) { if (is_null(Cache::get("throttle_notified:{$this->key}"))) {
App::forgetInstance('translator'); App::forgetInstance('translator');
$t = app('translator'); $t = app('translator');