lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: avoid plugin system for native dpinger scripts fetching dpinger_status() #6825

Browse Source
This commit is contained in:
Franco Fichtner 2023-09-07 08:31:06 +02:00
parent 943b3fcf2c
commit a2ab96833d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/scripts/OPNsense/Monit/gateway_alert
View File

@ -27,9 +27,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
require_once('config.inc');
require_once('interfaces.inc');
require_once('util.inc');
require_once 'config.inc';
require_once 'interfaces.inc';
require_once 'util.inc';
require_once 'plugins.inc.d/dpinger.inc';
/**
* @param string $status
@ -50,7 +51,7 @@ function get_gateway_error(string $status, string $gwname, array $group)
}
}
$gateways_status = return_gateways_status();
$gateways_status = dpinger_status();
$clean = true;
if (isset($config['gateways']['gateway_group'])) {

3
src/opnsense/scripts/routes/gateway_status.php
View File

@ -30,9 +30,10 @@
require_once 'config.inc';
require_once 'util.inc';
require_once 'interfaces.inc';
require_once 'plugins.inc.d/dpinger.inc';
$result = [];
$gateways_status = return_gateways_status();
$gateways_status = dpinger_status();
foreach ((new \OPNsense\Routing\Gateways())->gatewaysIndexedByName() as $gname => $gw) {
$gatewayItem = ['name' => $gname];

3
src/opnsense/scripts/routes/gateway_watcher.php
View File

@ -30,6 +30,7 @@
require_once 'config.inc';
require_once 'util.inc';
require_once 'interfaces.inc';
require_once 'plugins.inc.d/dpinger.inc';
function signalhandler($signal)
{
@ -56,7 +57,7 @@ sleep($wait);
while (1) {
pcntl_signal_dispatch();
$status = return_gateways_status();
$status = dpinger_status();
$alarm = false;
/* clear known gateways in first step to flush unknown in second step */