tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-4dce98e2' into 'develop' 

Revert "Only stop service in windows when error not XML PARSER problems. Gitlab: #518"

See merge request !253
This commit is contained in:
mlopez 2017-03-14 14:43:17 +01:00
parent 8b2c0d2e51 75e8926c11
commit e777e5be77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/bin/pandora_server
View File

@ -173,7 +173,7 @@ 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'}) && @_ !~ m/XML\/Parser/);
callback_stop() if ($^O eq 'MSWin32' && defined($Config{'win32_service'}));
foreach my $error_line (@_) {
# Trap the XML error and exit without nasty messages