From ce576441fad88b4c1fe2548897b25943cd2d2387 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Tue, 14 Mar 2017 16:47:09 +0100 Subject: [PATCH 1/2] 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 6870d82cbf..0730bc4f03 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'})); } ######################################################################################## From 02b5400d2f411bbc5c6b301aed5c8da6bc7146c0 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 14 Mar 2017 17:03:34 +0100 Subject: [PATCH 2/2] Removed mr sql --- pandora_console/extras/mr/1.sql | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 pandora_console/extras/mr/1.sql diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql deleted file mode 100644 index cde26c5476..0000000000 --- a/pandora_console/extras/mr/1.sql +++ /dev/null @@ -1,9 +0,0 @@ -BEGIN transaction; -CREATE TABLE IF NOT EXISTS `ttable_test_nueva` ( - `id` int(10) unsigned NOT NULL auto_increment, - `field1` varchar(60) NOT NULL default '', - `field2` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `tusuario` ADD COLUMN `test_nuevo` tinyint(1) NOT NULL DEFAULT 0; -COMMIT;