2013-01-10 Dario Rodriguez <dario.rodriguez@artica.es>

* lib/PandoraFMS/PluginServer.pm: Added log traces for plugin error
        to notice about low memory.
        * util/plugin/mysql_plugin.sh: Added correct exit code for plugin.

        MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_server/ChangeLog

@@ -1,3 +1,11 @@
+2013-01-10  Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* lib/PandoraFMS/PluginServer.pm: Added log traces for plugin error
+	to notice about low memory.
+	* util/plugin/mysql_plugin.sh: Added correct exit code for plugin.
+
+	MERGED FROM 4.0.3
+
 2013-01-10  Hirofumi Kosaka <kosaka@rworks.jp>
 
 	* lib/PandoraFMS/SNMPServer.pm: Rewrite my commit at rev7388 in more

pandora_server/lib/PandoraFMS/PluginServer.pm

@@ -222,6 +222,7 @@ sub data_consumer ($$) {
 	}
 
 	if (! defined $module_data || $module_data eq '') {
+		logger ($pa_config,"[ERROR] Undefined value returned by Plugin query. Is the server out of memory?" , 0);
 		pandora_update_module_on_error ($pa_config, $module, $dbh);
 		return;
 	}

pandora_server/util/plugin/mysql_plugin.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Mysql remote Plugin for Pandora FMS Plugin server
-# (c) ArticaST, Sancho Lerena 2008
+# (c) ArticaST, Sancho Lerena 2012
 
 
 # Default values
@@ -64,4 +64,4 @@ done
 
 echo "show global status" | mysql -u $USER -p$PASSWORD -h$SERVER | grep "$QUERY" | head -1 | awk '{ print $2 }'
 
-
+exit 0;