From b4a53120e594016278b77274eb378bd9d257ed75 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Tue, 14 Mar 2017 16:47:09 +0100 Subject: [PATCH] Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518 --- pandora_server/bin/pandora_server | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index afd8afe70a..ae9e03d7e2 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -173,8 +173,6 @@ sub pandora_crash () { # worried about that. If perl has a more "clean" way to avoid this messages # will be nice to replace this code, but at this time it's the only way I know - callback_stop() if ($^O eq 'MSWin32' && defined($Config{'win32_service'})); - foreach my $error_line (@_) { # Trap the XML error and exit without nasty messages if ($error_line =~ m/XML\/Parser/) { @@ -208,6 +206,8 @@ sub pandora_crash () { print_message (\%Config, ' [E] Unhandled error in "' . $Config{'servername'} . "\". See more information in logfiles at '/var/log/pandora' \n", 0); print_message (\%Config, " Error description:\n", 0); print_message (\%Config, $full_error, 0); + + callback_stop() if ($^O eq 'MSWin32' && defined($Config{'win32_service'})); } ########################################################################################