Add invalidate and reload

murrant · Nov 27, 2024 · 0fdc1a2 · 0fdc1a2
1 parent 31db60b
commit 0fdc1a2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/app/Facades/LibrenmsConfig.php b/app/Facades/LibrenmsConfig.php
@@ -27,6 +27,7 @@
 
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\Facades\Log;
 
 class LibrenmsConfig extends Facade
 {
@@ -40,4 +41,12 @@ public static function reload(): void
         App::forgetInstance('librenms-config'); // clear singleton
         self::clearResolvedInstances(); // clear facade resolved instances cache
     }
+
+    public static function invalidateAndReload(): void
+    {
+        self::invalidateCache();
+        self::reload();
+
+        Log::info('LibreNMS config cache cleared and config reloaded.');
+    }
 }
diff --git a/discovery.php b/discovery.php
@@ -70,8 +70,7 @@
     echo "DEBUG!\n";
     Debug::setVerbose(isset($options['v']));
     \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
-    LibrenmsConfig::invalidateCache();
-    LibrenmsConfig::reload();
+    LibrenmsConfig::invalidateAndReload();
 }
 
 if (! $where) {

diff --git a/scripts/collect-snmp-data.php b/scripts/collect-snmp-data.php
@@ -127,8 +127,7 @@
 
     echo 'Capturing Data: ';
     \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
-    LibrenmsConfig::invalidateCache();
-    LibrenmsConfig::reload();
+    LibrenmsConfig::invalidateAndReload();
     $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) {

diff --git a/scripts/save-test-data.php b/scripts/save-test-data.php
@@ -144,8 +144,7 @@
         echo PHP_EOL;
 
         \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
-        LibrenmsConfig::invalidateCache();
-        LibrenmsConfig::reload();
+        LibrenmsConfig::invalidateAndReload();
         $tester = new ModuleTestHelper($modules, $target_os, $target_variant);
         if (! $no_save && ! empty($output_file)) {
             $tester->setJsonSavePath($output_file);

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -84,7 +84,6 @@
 }
 
 \LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
-LibrenmsConfig::invalidateCache();
-LibrenmsConfig::reload();
+LibrenmsConfig::invalidateAndReload();
 
 app()->terminate(); // destroy the bootstrap Laravel application