Enable config caching

default 5 minutes (when testing set CONFIG_CACHE_TTL higher so issues are obvious)
lnms config:clear now clears both Laravel and LibreNMS config caches.  LibreNMS config cache will automatically regenerate on next application load.

app/ConfigRepository.php

@@ -239,6 +239,8 @@ public function persist($key, $value): bool
             // delete any children (there should not be any unless it is legacy)
             \App\Models\Config::query()->where('config_name', 'like', "$key.%")->delete();
 
+            $this->invalidateCache(); // config has been changed, it will need to be reloaded
+
             return true;
         } catch (Exception $e) {
             if (class_exists(Log::class)) {
@@ -316,6 +318,16 @@ public function getAll(): array
         return $this->config;
     }
 
+    /**
+     * Invalidate config cache (but don't reload)
+     * Next time the config is loaded, it will loaded fresh
+     * Because this is currently hardcoded to file cache, it will only clear the cache on this node
+     */
+    public function invalidateCache(): void
+    {
+        Cache::driver('file')->forget('librenms-config');
+    }
+
     /**
      * merge the database config with the global config,
      * global config overrides db
@@ -456,8 +468,8 @@ private function loadPostUserConfigDefaults(): void
         if (! $this->has('snmp.unescape')) {
             $this->persist('snmp.unescape', version_compare((new Version($this))->netSnmp(), '5.8.0', '<'));
         }
-        if (! self::has('reporting.usage')) {
-            self::persist('reporting.usage', (bool) Callback::get('enabled'));
+        if (! $this->has('reporting.usage')) {
+            $this->persist('reporting.usage', (bool) Callback::get('enabled'));
         }
 
         // populate legacy DB credentials, just in case something external uses them.  Maybe remove this later

app/Console/Commands/ClearConfigCommand.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\LnmsCommand;
+use App\Facades\LibrenmsConfig;
+use Illuminate\Foundation\Console\ConfigClearCommand;
+use Symfony\Component\Console\Input\ArrayInput;
+
+class ClearConfigCommand extends LnmsCommand
+{
+    protected $name = 'config:clear';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle(ConfigClearCommand $configClearCommand)
+    {
+        $configClearCommand->setLaravel($this->laravel);
+        $configClearCommand->run(new ArrayInput([]), $this->output);
+
+        LibrenmsConfig::invalidateCache();
+    }
+}

app/Console/Commands/DevicePoll.php

@@ -4,6 +4,7 @@
 
 use App\Console\LnmsCommand;
 use App\Events\DevicePolled;
+use App\Facades\LibrenmsConfig;
 use App\Jobs\PollDevice;
 use App\Models\Device;
 use App\Polling\Measure\MeasurementManager;
@@ -56,6 +57,8 @@ public function handle(MeasurementManager $measurements): int
             if ($this->getOutput()->isVerbose()) {
                 Log::debug(Version::get()->header());
                 \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
+                LibrenmsConfig::invalidateCache();
+                LibrenmsConfig::reload();
             }
 
             $module_overrides = Module::parseUserOverrides(explode(',', $this->option('modules') ?? ''));

config/librenms.php

@@ -61,5 +61,5 @@
      | Amount of seconds to allow the config to be cached.  0 means no cache.
      */
 
-     'config_cache_ttl' => env('CONFIG_CACHE_TTL', 0),
+     'config_cache_ttl' => env('CONFIG_CACHE_TTL', 300),
  ];

discovery.php

@@ -70,6 +70,8 @@
     echo "DEBUG!\n";
     Debug::setVerbose(isset($options['v']));
     \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
+    LibrenmsConfig::invalidateCache();
+    LibrenmsConfig::reload();
 }
 
 if (! $where) {

lang/en/commands.php

@@ -1,6 +1,9 @@
 <?php
 
 return [
+    'config:clear' => [
+        'description' => 'Clear config cache.  This will allow any changes that have been made since the last full config load to be reflected in the current config.',
+    ],
     'config:get' => [
         'description' => 'Get configuration value',
         'arguments' => [

scripts/collect-snmp-data.php

@@ -127,6 +127,8 @@
 
     echo 'Capturing Data: ';
     \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
+    LibrenmsConfig::invalidateCache();
+    LibrenmsConfig::reload();
     $capture->captureFromDevice($device['device_id'], $prefer_new_snmprec, $full);
     echo "\nVerify these file(s) do not contain any private data before sharing!\n";
 } catch (InvalidModuleException $e) {

scripts/save-test-data.php

@@ -144,6 +144,8 @@
         echo PHP_EOL;
 
         \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
+        LibrenmsConfig::invalidateCache();
+        LibrenmsConfig::reload();
         $tester = new ModuleTestHelper($modules, $target_os, $target_variant);
         if (! $no_save && ! empty($output_file)) {
             $tester->setJsonSavePath($output_file);

tests/bootstrap.php

@@ -84,5 +84,7 @@
 }
 
 \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
+LibrenmsConfig::invalidateCache();
+LibrenmsConfig::reload();
 
 app()->terminate(); // destroy the bootstrap Laravel application