2014-06-03 Junichi Satoh <junichi@rworks.jp>

* lib/PandoraFMS/Core.pm: Changed to ignore 'FF timeout' except async
	modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10085 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-06-03 04:44:31 +00:00
parent 4f99dd9d92
commit fe334c974b
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2014-06-03 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Changed to ignore 'FF timeout' except async
modules.
2014-05-31 Junichi Satoh <junichi@rworks.jp> 2014-05-31 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define * lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define

View File

@ -1097,14 +1097,14 @@ sub pandora_process_module ($$$$$$$$$;$) {
$status_changes = $min_ff_event if ($status_changes > $module->{'min_ff_event'}); $status_changes = $min_ff_event if ($status_changes > $module->{'min_ff_event'});
$status_changes++; $status_changes++;
if ($min_ff_event != 0 && $ff_timeout != 0 && ($utimestamp - $ff_start_utimestamp) > $ff_timeout) { if ($module_type =~ m/async/ && $min_ff_event != 0 && $ff_timeout != 0 && ($utimestamp - $ff_start_utimestamp) > $ff_timeout) {
$status_changes = 0; $status_changes = 0;
$ff_start_utimestamp = $utimestamp; $ff_start_utimestamp = $utimestamp;
} }
} }
else { else {
$status_changes = 0; $status_changes = 0;
$ff_start_utimestamp = $utimestamp; $ff_start_utimestamp = $utimestamp if ($module_type =~ m/async/);
} }
# Active ff interval # Active ff interval