Updated error handler

[gosa.git] / gosa-si / gosa-si-client

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index cfe60390cc535661552f6bb9a59e277af2ca00be..7f721da2f1a6675ce2fded8e859549b6b3a91bfe 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -30,7 +30,6 @@ use Time::HiRes qw( gettimeofday );
 use POE qw(Component::Server::TCP Wheel::FollowTail Wheel::Run);
 use IO::Socket::INET;
 use NetAddr::IP;
-use Data::Dumper;
 use Crypt::Rijndael;
 use GOSA::GosaSupportDaemon;
 use Digest::MD5  qw(md5_hex md5 md5_base64);
@@ -819,7 +818,7 @@ sub trigger_seen_messages {
     # Select all files under /tmp with prefix 'goto_notify'
     my $goto_dir = "/tmp";
     opendir(DIR, $goto_dir);
-    my @goto_files = grep { /^goto_notify_/ && -f "$goto_dir/$_" } readdir(DIR);
+    my @goto_files = grep { /.+\.goto_notify$/ && -f "$goto_dir/$_" } readdir(DIR);
     closedir DIR;
 
     # Check if file has 'seen' tag
@@ -1068,6 +1067,7 @@ sub server_input {
 
                        # if client is alread in a registration process, that means not registered, do nothing
                        # if not, cause re-registration
+# TODO : This if-else can cause a registration deadlock. Currently I can not reproduce the deadlock and don't have a clue what is the reason for the deadlock
                        if (not $REGISTERED) {
                                &daemon_log("WARNING: gosa-si-client is already in a registration process so ignore this message", 3);
                        } else {
@@ -1259,7 +1259,6 @@ if (defined $server_ip && defined $server_port) {
 $xml = new XML::Simple();
 $default_server_key = $server_key;
 
-
 # add gosa-si-server address from config file at first position of server list
 my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
 my $server_check = (defined($server_check_cfg))?$server_check_cfg->val( "server", "ip"):undef;