Merge remote-tracking branch 'refs/remotes/origin/master'

Martin22 · Sep 5, 2022 · 6fda23b · 6fda23b
2 parents d386733 + 988a41f
commit 6fda23b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/LibreNMS/Modules/LegacyModule.php b/LibreNMS/Modules/LegacyModule.php
@@ -48,6 +48,12 @@ public function discover(OS $os): void
 
     public function poll(OS $os): void
     {
+        if (! is_file(base_path("includes/polling/$this->name.inc.php"))) {
+            echo "Module $this->name does not exist, please remove it from your configuration";
+
+            return;
+        }
+
         $device = &$os->getDeviceArray();
         $device['attribs'] = $os->getDevice()->attribs->toArray();
         Debug::disableErrorReporting(); // ignore errors in legacy code

diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
@@ -315,6 +315,12 @@ function poll_device($device, $force_module = false)
         $measurements->checkpoint(); // don't count previous stats
 
         foreach (Config::get('poller_modules') as $module => $module_status) {
+            if (! is_file("includes/polling/$module.inc.php")) {
+                echo "Module $module does not exist, please remove it from your configuration";
+
+                continue;
+            }
+
             $os_module_status = Config::get("os.{$device['os']}.poller_modules.$module");
             d_echo('Modules status: Global' . (isset($module_status) ? ($module_status ? '+ ' : '- ') : '  '));
             d_echo('OS' . (isset($os_module_status) ? ($os_module_status ? '+ ' : '- ') : '  '));