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

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index ab3b14ba4..7330d128d 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;
@@ -41,6 +41,10 @@ use File::Spec;
 # Workaround: need pure perl to make it work with UTF-8 :-(
 $XML::Simple::PREFERRED_PARSER= "XML::SAX::PurePerl";
 
+my $client_version = '$HeadURL$:$Rev$';
+my $client_headURL;
+my $client_revision;
+my $client_status;
 my $event_dir = "/usr/lib/gosa-si/client/events";
 use lib "/usr/lib/gosa-si/client/events";
 
@@ -76,7 +80,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
@@ -150,7 +154,7 @@ sub check_cmdline_param () {
 sub read_configfile {
     my ($cfg_file, %cfg_defaults) = @_ ;
     my $cfg;
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {
@@ -162,7 +166,7 @@ sub read_configfile {
     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 ] );
+           ${@$pinfo[ 0 ]} = $cfg->val( $section, $param, @$pinfo[ 1 ] );
         }
     }
 }
@@ -221,7 +225,7 @@ sub sig_int_handler {
     my ($signal) = @_;
 	
     daemon_log("shutting down gosa-si-client", 1);
-    system("killall gosa-si-client");
+    system("kill `ps -C gosa-si-client -o pid=`");
 }
 $SIG{INT} = \&sig_int_handler;
 
@@ -732,6 +736,8 @@ sub register_at_gosa_si_server {
 			&add_content2xml_hash($register_hash, "new_passwd", $server_key);
 			&add_content2xml_hash($register_hash, "mac_address", $local_mac);
 			&add_content2xml_hash($register_hash, "events", $events);
+            &add_content2xml_hash($register_hash, "client_status", $client_status);
+            &add_content2xml_hash($register_hash, "client_revision", $client_revision);
 			&add_content2xml_hash($register_hash, "gotoHardwareChecksum", $gotoHardwareChecksum);
 
 			# Add $HOSTNAME from ENV if force-hostname is set
@@ -746,6 +752,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 +774,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
@@ -916,7 +922,7 @@ sub import_events {
 
     while (defined (my $event = readdir (DIR))) {
         if( $event eq "." || $event eq ".." ) { next; }    
-
+        daemon_log("INFO: found event module: $event", 5); 
         eval{ require $event; };
         if( $@ ) {
             daemon_log("ERROR: import of event module '$event' failed", 1);
@@ -958,39 +964,25 @@ 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;
-#
-#        if( defined $result ) { 
-#            chomp($result);
-#            @res_lines = split("\n", $result);
-#        }
-#
-#        my @logged_in_user_list;
-#        foreach my $line (@res_lines) {
-#            chomp($line);
-#            my @line_parts = split(/\s+/, $line); 
-#            push(@logged_in_user_list, $line_parts[0]);
-#        }
-#        
         system("echo 'CURRENTLY_LOGGED_IN ".join(" ", @logged_in_user_list)."' > /var/run/gosa-si-client.socket"); 
         $kernel->delay_set('trigger_logged_in_users_report', $trigger_logged_in_users_report_delay);
     } else {
-        # try it in 1 sec again
+        # try it in 10 sec again
         $kernel->delay_set('trigger_logged_in_users_report', 10);
     }
 }
 
 
-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 +1076,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'); 
 }
@@ -1216,8 +1212,7 @@ if( ! $foreground ) {
     $pid = fork;
     setsid                    or die "Can't start a new session: $!";
     umask 0;
-} 
-else { 
+} else { 
     $pid = $$; 
 }
 
@@ -1231,8 +1226,22 @@ if( 0 != $pid ) {
     };
 }
 
+# parse head url and revision from svn
+my $client_status_hash = { 'developmental'=>'revision', 'stable'=>'release'};
+$client_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/;
+$client_headURL = defined $1 ? $1 : 'unknown' ;
+$client_revision = defined $2 ? $2 : 'unknown' ;
+if ($client_headURL =~ /\/tag\// || 
+        $client_headURL =~ /\/branches\// ) {
+    $client_status = "stable"; 
+} else {
+    $client_status = "developmental" ;
+}
+
 daemon_log(" ", 1);
 daemon_log("$prg started!", 1);
+daemon_log("status: $client_status", 1);
+daemon_log($client_status_hash->{$client_status}.": $client_revision", 1); 
 
 # delete old DBsqlite lock files
 system('rm -f /tmp/gosa_si_lock*gosa-si-client*');
@@ -1278,7 +1287,7 @@ $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 = $server_check_cfg->val( "server", "ip");
+my $server_check = (defined($server_check_cfg))?$server_check_cfg->val( "server", "ip"):undef;
 if( defined $server_check ) {
 	unshift(@servers, $server_address);
 	my $servers_string = join(", ", @servers);