X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=4ce9ceb4c57e283a177826393da0ead47a46cdf4;hb=c2b5f970fe313e145182de022b43a2cd26641d09;hp=ab3b14ba480c178f141449ef06402dedf0fb5e87;hpb=873a2837bc112c6b1bf83b913133af638df22a44;p=gosa.git

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index ab3b14ba4..4ce9ceb4c 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -25,7 +25,7 @@ use Config::IniFiles;
 use POSIX;
 use Time::HiRes qw( gettimeofday );
 
-use POE qw(Component::Server::TCP Wheel::FollowTail);
+use POE qw(Component::Server::TCP Wheel::FollowTail Wheel::Run);
 use IO::Socket::INET;
 use NetAddr::IP;
 use Data::Dumper;
@@ -76,7 +76,7 @@ $gosa_si_client_fifo = "/var/run/gosa-si-client.socket";
 
 # in function register_at_gosa_si_server, after which period of seconds a new registration should be tried if a registration was 
 # not successful until now
-my $delay_set_time = 5;
+my $delay_set_time = 10;
 our $prg= basename($0);
 
 # all x seconds the client reports logged_in users to gosa-si-server
@@ -746,6 +746,8 @@ sub register_at_gosa_si_server {
       		# send xml hash to server with general server passwd
 			my $res = &send_msg_hash_to_target($register_hash, $server, $default_server_key);
 	  
+			if( $try_to_register >= @servers )  { last; }
+
 	  		# if delivery of registration msg succeed
 			if($res == 0) {
         		# reset try_to_register
@@ -766,8 +768,6 @@ sub register_at_gosa_si_server {
 				next;
 			}
 
-			if( $try_to_register >= @servers )  { last; }
-
     } # end of while
 
 	# one circle through all servers finished and no registration succeed
@@ -958,7 +958,7 @@ sub trigger_logged_in_users_report {
 		my @logged_in_user_list;
 		if( defined $result ) {
 			chomp($result);
-			@logged_in_user_list = split("\s", $result);
+			@logged_in_user_list = split(/\s/, $result);
 		}
 		
 #        my @res_lines;
@@ -984,13 +984,13 @@ sub trigger_logged_in_users_report {
 }
 
 
-sub generic_file_reset {
-    my ( $heap, $wheel_id ) = @_[ HEAP, ARG0 ];
-
-    my $service = $heap->{services}->{$wheel_id};
-    daemon_log("INFO: '$service' watching reset", 5);
-    return;
-}
+#sub generic_file_reset {
+#    my ( $heap, $wheel_id ) = @_[ HEAP, ARG0 ];
+#
+#    my $service = $heap->{services}->{$wheel_id};
+#    daemon_log("INFO: '$service' watching reset", 5);
+#    return;
+#}
 
 sub generic_file_error {
     my ( $heap, $operation, $errno, $error_string, $wheel_id ) =
@@ -1084,15 +1084,19 @@ sub _start {
     $kernel->yield('register_at_gosa_si_server');
     
     # install all file watcher defined
-    while( my($file_name, $file) = each %files_to_watch ) {
-        my $file_watcher = POE::Wheel::FollowTail->new(
+    while( my($name, $file) = each %files_to_watch ) {
+        my $watcher = POE::Wheel::FollowTail->new(
             Filename   => $file,
-            InputEvent => $file_name."_record",
-            ResetEvent => "file_reset",
+            InputEvent => $name."_record",
+        #    ResetEvent => "file_reset",
             ErrorEvent => "file_error",
             );
-        $heap->{services}->{ $file_watcher->ID } = $file_name;
-        $heap->{watchers}->{ $file_watcher->ID } = $file_watcher;
+#	$heap->{tail} = POE::Wheel::Run->new(
+#		Program     => [ "/usr/bin/tail", "-f", $file ],
+#		StdoutEvent => $file_name."_record",
+#	);
+        $heap->{services}->{ $watcher->ID } = $name;
+        $heap->{watchers}->{ $watcher->ID } = $watcher;
     }
     $kernel->yield('trigger_logged_in_users_report'); 
 }