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

Support specifying submodules in poller and discovery for debug (#8896)

Browse Source 
Mostly useful for debugging

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
This commit is contained in:
Tony Murray
2018-07-12 15:30:39 -05:00
committed by Neil Lathwood
parent 33887417ee
commit 846cf11331
12 changed files with 129 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/Util/ModuleTestHelper.php
+7 -7
View File
@@ -175,8 +175,8 @@ class ModuleTestHelper
$save_vedbug = $vdebug;
$debug = true;
$vdebug = false;
discover_device($device, $this->getArgs());
poll_device($device, $this->getArgs());
discover_device($device, $this->parseArgs('discovery'));
poll_device($device, $this->parseArgs('poller'));
$debug = $save_debug;
$vdebug = $save_vedbug;
$collection_output = ob_get_contents();
@@ -306,13 +306,13 @@ class ModuleTestHelper
return array_unique($full_list);
}
private function getArgs()
private function parseArgs($type)
{
if (empty($this->modules)) {
return [];
return false;
}
return ['m' => implode(',', $this->modules)];
return parse_modules($type, ['m' => implode(',', $this->modules)]);
}
private function qPrint($var)
@@ -519,7 +519,7 @@ class ModuleTestHelper
}
ob_start();
discover_device($device, $this->getArgs());
discover_device($device, $this->parseArgs('discovery'));
$this->discovery_output = ob_get_contents();
if ($this->quiet) {
@@ -547,7 +547,7 @@ class ModuleTestHelper
}
ob_start();
poll_device($device, $this->getArgs());
poll_device($device, $this->parseArgs('poller'));
$this->poller_output = ob_get_contents();
if ($this->quiet) {