From 6569886040750dbd367294095f49e6c4826ecee4 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Wed, 10 Feb 2010 17:49:47 +0000
Subject: [PATCH] 2010-02-10 Sancho Lerena <slerena@artica.es>
* bin/pandora_server: Better error management, avoiding to show Enterprise
loading errors.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_server/bin/pandora_server | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index cce4e3ae2d..f77081facd 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -128,9 +128,8 @@ sub pandora_crash () {
# Avoid show messages about enterprise library loading failurem, VERY
# confussing.
-
foreach my $error_line (@_) {
- if ($error_line !~ m/Enterprise/i){
+ if ($error_line !~ m/Enterprise/i && $error_line !~ m/ConfigLocal/i){
logger (\%Config, '[E] \'' . $Config{'servername'} . "': $error_line", 1);
} else {
$show_error = 1;
@@ -145,7 +144,7 @@ sub pandora_crash () {
# It's interesting show by console problems, not only in logs. This helps
# to solve stupid problems like Database credential problems for example
- if ($full_error !~ m/Enterprise/i) {
+ if ($full_error !~ m/Enterprise/i && $full_error !~ m/ConfigLocal/i) {
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);