tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run deploy agents task from script

Browse Source
This commit is contained in:
Enrique Martin 2024-02-28 10:56:25 +01:00
parent 3776f10bc7
commit 244433983d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -148,15 +148,15 @@ sub data_producer ($) {
WHERE id_recon_server = ? WHERE id_recon_server = ?
AND disabled = 0 AND disabled = 0
AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1) AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())) OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())
OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0)', $server_id); OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0))', $server_id);
} else { } else {
@rows = get_db_rows ($dbh, 'SELECT * FROM trecon_task @rows = get_db_rows ($dbh, 'SELECT * FROM trecon_task
WHERE (id_recon_server = ? OR id_recon_server NOT IN (SELECT id_server FROM tserver WHERE status = 1 AND server_type = ?)) WHERE (id_recon_server = ? OR id_recon_server NOT IN (SELECT id_server FROM tserver WHERE status = 1 AND server_type = ?))
AND disabled = 0 AND disabled = 0
AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1) AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())) OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())
OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0)', $server_id, DISCOVERYSERVER); OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0))', $server_id, DISCOVERYSERVER);
} }
foreach my $row (@rows) { foreach my $row (@rows) {
@ -317,12 +317,6 @@ sub data_consumer ($$) {
&& -f $cnf_extra{'creds_file'}) { && -f $cnf_extra{'creds_file'}) {
unlink($cnf_extra{'creds_file'}); unlink($cnf_extra{'creds_file'});
} }
# Clean one shot tasks
if ($task->{'type'} eq DISCOVERY_DEPLOY_AGENTS) {
db_delete_limit($dbh, ' trecon_task ', ' id_rt = ? ', 1, $task->{'id_rt'});
}
}; };
if ($@) { if ($@) {
logger( logger(