From fd5ba3d0f833b2a5da4f874068bf6f2501eab494 Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Fri, 2 Jun 2023 16:06:28 -0500 Subject: [PATCH 1/3] Change to reduce event text from XML parse error --- pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index ac4364dca1..140482e54f 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -325,7 +325,7 @@ sub data_consumer ($$) { } rename($file_name, $file_name . '_BADXML'); - pandora_event ($pa_config, "Unable to process XML data file '$file_name': $xml_err", 0, 0, 0, 0, 0, 'error', 0, $dbh); + pandora_event ($pa_config, "Unable to process XML data file ".(substr $file_name, 0, 20)."...", 0, 0, 0, 0, 0, 'error', 0, $dbh); agent_unlock($pa_config, $agent_name); } From 3ed55ec88aa63528c3777ec13e74e62dd4576d77 Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Mon, 5 Jun 2023 12:36:53 -0500 Subject: [PATCH 2/3] fix: Change $file_name variable for $task --- pandora_server/lib/PandoraFMS/DataServer.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index 140482e54f..a53f6859fc 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -324,8 +324,8 @@ sub data_consumer ($$) { return; } - rename($file_name, $file_name . '_BADXML'); - pandora_event ($pa_config, "Unable to process XML data file ".(substr $file_name, 0, 20)."...", 0, 0, 0, 0, 0, 'error', 0, $dbh); + rename($task, $task.'_BADXML'); + pandora_event ($pa_config, "Unable to process XML data file '$task'.", 0, 0, 0, 0, 0, 'error', 0, $dbh); agent_unlock($pa_config, $agent_name); } From 045a773937960edbb75ffc408d5ac31f078c3179 Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Tue, 6 Jun 2023 09:56:16 -0500 Subject: [PATCH 3/3] Revert "$task rename" to "$file_name rename" --- pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index a53f6859fc..52abb1c007 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -324,7 +324,7 @@ sub data_consumer ($$) { return; } - rename($task, $task.'_BADXML'); + rename($file_name, $file_name.'_BADXML'); pandora_event ($pa_config, "Unable to process XML data file '$task'.", 0, 0, 0, 0, 0, 'error', 0, $dbh); agent_unlock($pa_config, $agent_name); }