From 1cc3c41c583d78412872c5e328fe5514949e1a5b Mon Sep 17 00:00:00 2001 From: rettenbe Date: Mon, 4 Aug 2008 12:40:47 +0000 Subject: [PATCH] update: failed importing of event modules cause a programm crash now git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12137 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 26 -------------------------- gosa-si/modules/GosaSupportDaemon.pm | 7 +++++-- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 2f224016e..1a79a5783 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -277,32 +277,6 @@ EOF } -#=== FUNCTION ================================================================ -# NAME: read_configfile -# PARAMETERS: cfg_file - string - -# RETURNS: nothing -# DESCRIPTION: read cfg_file and set variables -#=============================================================================== -#sub read_configfile { -# my $cfg; -# if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) { -# if( -r $cfg_file ) { -# $cfg = Config::IniFiles->new( -file => $cfg_file ); -# } else { -# print STDERR "Couldn't read config file!\n"; -# } -# } else { -# $cfg = Config::IniFiles->new() ; -# } -# foreach my $section (keys %cfg_defaults) { -# foreach my $param (keys %{$cfg_defaults{ $section }}) { -# my $pinfo = $cfg_defaults{ $section }{ $param }; -# ${@$pinfo[ 0 ]} = $cfg->val( $section, $param, @$pinfo[ 1 ] ); -# } -# } -#} - - #=== FUNCTION ================================================================ # NAME: logging # PARAMETERS: level - string - default 'info' diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm index 2427c8b7b..f0998cfe3 100644 --- a/gosa-si/modules/GosaSupportDaemon.pm +++ b/gosa-si/modules/GosaSupportDaemon.pm @@ -516,8 +516,11 @@ sub import_events { eval{ require $event; }; if( $@ ) { $error++; - push(@result, "import of event module '$event' failed: $@"); - next; + #push(@result, "import of event module '$event' failed: $@"); + #next; + + &main::daemon_log("ERROR: Import of event module '$event' failed: $@",1); + exit(1); } # fetch all single events -- 2.30.2