From ba2526baa7bedd0322adae756c4b381a097f36c7 Mon Sep 17 00:00:00 2001 From: koichirok Date: Wed, 15 Feb 2012 06:24:14 +0000 Subject: [PATCH] 2012-02-15 Koichiro Kikuchi * lib/PandoraFMS/PluginServer.pm: Now PluginServer treats exit status code 124 as "Unknown" when plugin type of the module is nagios and module type is boolean. timeout exits with 124 if command times out. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/PluginServer.pm | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 728b8ef9cd..3fb989b224 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2012-02-15 Koichiro Kikuchi + + * lib/PandoraFMS/PluginServer.pm: Treat exit status code 124 as + Unknown when plugin type of the module is nagios and module type + is boolean. timeout exits with 124 if command times out. + 2012-02-15 Hirofumi Kosaka * util/pandora_manage.pl: Fixed an error in help text. diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index a3da151e9d..3db09f029c 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -197,7 +197,8 @@ sub data_consumer ($$) { elsif ($ReturnCode == 2){ $module_data = 0; } - elsif ($ReturnCode == 3){ + elsif ($ReturnCode == 3 || $ReturnCode == 124){ + # 124 should be a exit code of the timeout command (command times out) $module_data = ''; # not defined = Uknown } elsif ($ReturnCode == 4){