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

Re-enable the ability to run a disabled module manually

Browse Source
This commit is contained in:
laf
2016-07-11 12:28:54 +01:00
parent 919b50f76b
commit 33415796bd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/discovery/functions.inc.php
View File

@@ -105,16 +105,18 @@ function discover_device($device, $options = null) {
echo "\n"; echo "\n";
// If we've specified modules, use them, else walk the modules array // If we've specified modules, use them, else walk the modules array
$force_module = false;
if ($options['m']) { if ($options['m']) {
$config['discovery_modules'] = array(); $config['discovery_modules'] = array();
foreach (explode(',', $options['m']) as $module) { foreach (explode(',', $options['m']) as $module) {
if (is_file("includes/discovery/$module.inc.php")) { if (is_file("includes/discovery/$module.inc.php")) {
$config['discovery_modules'][$module] = 1; $config['discovery_modules'][$module] = 1;
$force_module = true;
} }
} }
} }
foreach ($config['discovery_modules'] as $module => $module_status) { foreach ($config['discovery_modules'] as $module => $module_status) {
if ($attribs['discover_' . $module] || ( $module_status && !isset($attribs['discover_' . $module]))) { if ($force_module === true || $attribs['discover_' . $module] || ( $module_status && !isset($attribs['discover_' . $module]))) {
$module_start = microtime(true); $module_start = microtime(true);
echo "#### Load disco module $module ####\n"; echo "#### Load disco module $module ####\n";
include "includes/discovery/$module.inc.php"; include "includes/discovery/$module.inc.php";

6
includes/polling/functions.inc.php
View File

@@ -234,16 +234,18 @@ function poll_device($device, $options) {
// we always want the core module to be included // we always want the core module to be included
include 'includes/polling/core.inc.php'; include 'includes/polling/core.inc.php';
$force_module = false;
if ($options['m']) { if ($options['m']) {
$config['poller_modules'] = array(); $config['poller_modules'] = array();
foreach (explode(',', $options['m']) as $module) { foreach (explode(',', $options['m']) as $module) {
if (is_file('includes/polling/'.$module.'.inc.php')) { if (is_file('includes/polling/'.$module.'.inc.php')) {
$config['poller_modules'][$module] = 1; $config['poller_modules'][$module] = 1;
$force_module = true;
} }
} }
} }
foreach ($config['poller_modules'] as $module => $module_status) { foreach ($config['poller_modules'] as $module => $module_status) {
if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) { if ($force_module === true || $attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) {
$module_start = 0; $module_start = 0;
$module_time = 0; $module_time = 0;
$module_start = microtime(true); $module_start = microtime(true);
@@ -270,7 +272,7 @@ function poll_device($device, $options) {
unlink($oldrrd); unlink($oldrrd);
} }
} }
else if (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == '0') { elseif (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == '0') {
echo "Module [ $module ] disabled on host.\n"; echo "Module [ $module ] disabled on host.\n";
} }
else { else {