From 74c9e604e8a68bf55565c724d8caa27142f9b1de Mon Sep 17 00:00:00 2001
From: Daniel Rodriguez <daniel.rodriguez@artica.es>
Date: Wed, 28 Aug 2019 14:19:59 +0200
Subject: [PATCH] Revert "Merge branch
'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'"
This reverts merge request !2644
---
pandora_server/lib/PandoraFMS/DataServer.pm | 24 +--------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index b7beb919a3..b0c7e2dcc8 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -58,7 +58,6 @@ my %Agents :shared;
my $Sem :shared;
my $TaskSem :shared;
my $AgentSem :shared;
-my $XMLinSem :shared;
########################################################################################
# Data Server class constructor.
@@ -75,7 +74,6 @@ sub new ($$;$) {
$Sem = Thread::Semaphore->new;
$TaskSem = Thread::Semaphore->new (0);
$AgentSem = Thread::Semaphore->new (1);
- $XMLinSem = Thread::Semaphore->new (1);
# Call the constructor of the parent class
my $self = $class->SUPER::new($config, DATASERVER, \&PandoraFMS::DataServer::data_producer, \&PandoraFMS::DataServer::data_consumer, $dbh);
@@ -177,7 +175,6 @@ sub data_consumer ($$) {
my $agent_name = $1;
my $file_name = $pa_config->{'incomingdir'};
my $xml_err;
- my $error;
# Fix path
$file_name .= "/" unless (substr ($file_name, -1, 1) eq '/');
@@ -194,37 +191,18 @@ sub data_consumer ($$) {
for (0..1) {
eval {
- local $SIG{__DIE__};
threads->yield;
- # XML::SAX::ExpatXS is not thread safe.
- if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
- $XMLinSem->down();
- }
$xml_data = XMLin ($file_name, forcearray => 'module');
-
- if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
- $XMLinSem->up();
- }
};
# Invalid XML
- if ($@) {
- $error = 1;
- if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
- $XMLinSem->up();
- }
- }
-
- if ($error || ref($xml_data) ne 'HASH') {
-
+ if ($@ || ref($xml_data) ne 'HASH') {
if ($@) {
$xml_err = $@;
} else {
$xml_err = "Invalid XML format.";
}
-
- logger($pa_config, "Failed to parse $file_name $xml_err", 3);
sleep (2);
next;
}