mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix runtime cache (#16272)

Browse Source 
Fix runtime cache when redis is enabled, but not running
This commit is contained in:
Tony Murray
2024-08-06 13:11:44 -05:00
committed by GitHub
parent d1ee543b6b
commit cc971b6233
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LibreNMS/Traits/RuntimeClassCache.php
View File

@@ -27,7 +27,6 @@
namespace LibreNMS\Traits; namespace LibreNMS\Traits;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use LibreNMS\Util\Laravel;
trait RuntimeClassCache trait RuntimeClassCache
{ {
@@ -45,9 +44,18 @@ trait RuntimeClassCache
protected function cacheGet(string $name, callable $actual) protected function cacheGet(string $name, callable $actual)
{ {
if (! array_key_exists($name, $this->runtimeCache)) { if (! array_key_exists($name, $this->runtimeCache)) {
$this->runtimeCache[$name] = $this->runtimeCacheExternalTTL && Laravel::isBooted() if ($this->runtimeCacheExternalTTL) {
? Cache::remember('runtimeCache' . __CLASS__ . $name, $this->runtimeCacheExternalTTL, $actual) try {
: $actual(); $this->runtimeCache[$name] = Cache::remember('runtimeCache' . __CLASS__ . $name, $this->runtimeCacheExternalTTL, $actual);
return $this->runtimeCache[$name]; // system cache success, don't use local cache
} catch (\Exception $e) {
// go to fallback code
}
}
// non-persistent cache
$this->runtimeCache[$name] = $actual();
} }
return $this->runtimeCache[$name]; return $this->runtimeCache[$name];