tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-03-10 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Set tagente_estado.current_interval to
          tagente.intervalo if tagente_modulo.module_interval is 0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-03-10 13:20:56 +00:00
parent 336f7b1e9d
commit dc05a7cce3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Set tagente_estado.current_interval to
tagente.intervalo if tagente_modulo.module_interval is 0.
2010-03-08 Pablo de la Concepción <pablo.concepcion@artica.es>
* lib/PandoraFMS/GIS.pm, lib/PandoraFMS/GeoIP.pm: Modified to put

3
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -755,10 +755,11 @@ sub pandora_process_module ($$$$$$$$$;$) {
my $last_try = ($1 == 0) ? 0 : timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < (time() - 86400))) ? 1 : 0;
my $current_interval = ($module->{'module_interval'} == 0 ? $agent->{'intervalo'} : $module->{'module_interval'});
db_do ($dbh, 'UPDATE tagente_estado SET datos = ?, estado = ?, last_status = ?, status_changes = ?, utimestamp = ?, timestamp = ?,
id_agente = ?, current_interval = ?, running_by = ?, last_execution_try = ?, last_try = ?
WHERE id_agente_modulo = ?', $processed_data, $status, $last_status, $status_changes,
$current_utimestamp, $timestamp, $module->{'id_agente'}, $module->{'module_interval'}, $server_id,
$current_utimestamp, $timestamp, $module->{'id_agente'}, $current_interval, $server_id,
$utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $module->{'id_agente_modulo'});
# Save module data