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

Fix save-test-data (#8399)

Browse Source 
But now it buffers all output...
This commit is contained in:
Tony Murray
2018-03-16 04:11:49 -05:00
committed by Neil Lathwood
parent 69bedd0101
commit 3cd6d90239
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LibreNMS/Util/ModuleTestHelper.php
View File

@@ -511,19 +511,21 @@ class ModuleTestHelper
$save_debug = $debug;
$save_vedbug = $vdebug;
if ($this->quiet) {
ob_start();
$debug = true;
$vdebug = false;
}
ob_start();
discover_device($device, $this->getArgs());
$this->discovery_output = ob_get_contents();
if ($this->quiet) {
$this->discovery_output = ob_get_contents();
ob_end_clean();
$debug = $save_debug;
$vdebug = $save_vedbug;
} else {
ob_flush();
}
ob_end_clean();
$this->qPrint(PHP_EOL);
@@ -537,19 +539,21 @@ class ModuleTestHelper
// Run the poller
if ($this->quiet) {
ob_start();
$debug = true;
$vdebug = false;
}
ob_start();
poll_device($device, $this->getArgs());
$this->poller_output = ob_get_contents();
if ($this->quiet) {
$this->poller_output = ob_get_contents();
ob_end_clean();
$debug = $save_debug;
$vdebug = $save_vedbug;
} else {
ob_flush();
}
ob_end_clean();
// Parse polled modules
$this->poller_module_output = $this->extractModuleOutput($this->poller_output, 'poller');