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

2012-02-15 Koichiro Kikuchi <koichiro@rworks.jp> 

* 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
This commit is contained in:
koichirok 2012-02-15 06:24:14 +00:00
parent 9f24f44e83
commit d030cdc8e5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2012-02-15 Koichiro Kikuchi <koichiro@rworks.jp>
* 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 <kosaka@rworks.jp>
* util/pandora_manage.pl: Fixed an error in help text.

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

@ -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){