![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index db4773b465f9018d0a5c793f0daea58cf82a991f..5ce0d368fc429a0d9661857f1952bbafb510f8e3 100755 (executable)
our $server_key;
our $opts_dnslookup;
+our $FIFO_FD = undef;
+
# default variables
our $REGISTERED = 0;
our $REGISTRATION_IN_PROGRESS = 0;
}
}
+sub clean_shutdown
+{
+ unlink($pid_file) if (-w $pid_file);
+ unlink($gosa_si_client_fifo) if (-S $gosa_si_client_fifo);
+}
-sub sig_int_handler {
+sub sig_int_or_term_handler
+{
my ($signal) = @_;
+ daemon_log("Got SIG${signal} - shutting down gosa-si-client", 1);
+ clean_shutdown();
+ POE::Kernel->signal('client_session', 'KILL');
+ POE::Kernel->signal('gosa-si-client', 'KILL');
+ return 1;
+}
+
+sub sig_warn_handler
+{
+ my @loc = caller(0);
+ daemon_log( "SIGWARN line " . $loc[2] . ": " . $_[0], 1 );
+ return 1;
+}
- daemon_log("shutting down gosa-si-client", 1);
- system("kill `ps -C gosa-si-client -o pid=`");
+sub sig_die_handler
+{
+ my @loc = caller(0);
+ daemon_log( "SIGDIE line " . $loc[2] . ": " . $_[0], 1 );
+ clean_shutdown();
+ return 1;
}
-$SIG{INT} = \&sig_int_handler;
+$SIG{'INT'} = \&sig_int_or_term_handler;
+$SIG{'TERM'} = \&sig_int_or_term_handler;
+$SIG{'__WARN__'} = \&sig_warn_handler;
+$SIG{'__DIE__'} = \&sig_die_handler;
+$SIG{'USR1'} = 'IGNORE';
+$SIG{'USR2'} = 'IGNORE';
#=== FUNCTION ================================================================
# NAME: logging
if ($REGISTERED == 1) {
$REGISTERED = 0; # if server is not available, cause reregistering
daemon_log("INFO: cause reregistering at gosa-si-server", 5);
- $global_kernel->yield('register_at_gosa_si_server');
+ $global_kernel->post('client_session', 'register_at_gosa_si_server');
}
$error++;
last;
# delivery of registration msg failed
- } else {
- # wait 1 sec until trying to register again
- sleep(1);
- next;
+ } elsif($REGISTRATION_TRIES >= scalar(@servers)) {
+ last;
}
} # end of while
@logged_in_user_list = split(/\s/, $result);
}
- system("echo 'CURRENTLY_LOGGED_IN ".join(" ", @logged_in_user_list)."' > /var/run/gosa-si-client.socket");
+ $FIFO_FD = undef
+ if (! defined $FIFO_FD && ! defined open($FIFO_FD, '>', $gosa_si_client_fifo));
+ if (! defined $FIFO_FD) {
+ daemon_log("ERROR: unable to open fifo for writing: $!", 1);
+ $kernel->delay_set('trigger_logged_in_users_report', 30);
+ }
+ else {
+ print($FIFO_FD 'CURRENTLY_LOGGED_IN ' . join(" ", @logged_in_user_list));
$kernel->delay_set('trigger_logged_in_users_report', $trigger_logged_in_users_report_delay);
+ }
} else {
# try it in 10 sec again
$kernel->delay_set('trigger_logged_in_users_report', 10);
my $send_error = &send_msg_to_target($confirm_msg, $server_address, $server_key);
# Delete file
- if (not $send_error) {
- system("rm $goto_dir/$goto_file");
- }
+ unlink("$goto_dir/$goto_file")
+ if (! $send_error);
}
}
}
-sub sig_handler {
- my ($kernel, $signal) = @_[KERNEL, ARG0] ;
- daemon_log("0 INFO got signal '$signal'", 1);
- $kernel->sig_handled();
- return;
-}
-
-
sub _start {
my ($kernel, $heap) = @_[KERNEL, HEAP];
$kernel->alias_set('client_session');
$global_kernel = $kernel; # this is used to throw events at each point of the skript
- $kernel->sig(USR1 => "sig_handler");
-
# force a registration at a gosa-si-server
$kernel->yield('register_at_gosa_si_server');
}
+sub _stop {
+ my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
+ delete $heap->{'services'};
+ delete $heap->{'watchers'};
+ $kernel->alias_remove($heap->{alias});
+ $kernel->alarm_remove_all();
+ $kernel->post($heap->{child_session}, '_stop');
+ close( $FIFO_FD ) if( defined $FIFO_FD );
+}
+
+
sub _default {
daemon_log("ERROR: can not handle incoming msg with header '$_[ARG0]'", 1);
return;
&read_configfile($cfg_file, %cfg_defaults);
&check_pid;
-# forward error messages to logfile
-if ( ! $foreground ) {
- open( STDIN, '+>/dev/null' );
- open( STDOUT, '+>&STDIN' );
- open( STDERR, '+>&STDIN' );
-}
-
-# Just fork, if we are not in foreground mode
-if( ! $foreground ) {
- chdir '/' or die "Can't chdir to /: $!";
- $pid = fork;
- setsid or die "Can't start a new session: $!";
- umask 0;
-} else {
- $pid = $$;
-}
-
-# Do something useful - put our PID into the pid_file
-if( 0 != $pid ) {
- open( LOCK_FILE, ">$pid_file" );
- print LOCK_FILE "$pid\n";
- close( LOCK_FILE );
- if( !$foreground ) {
- exit( 0 )
- };
-}
-
# parse head url and revision from svn
my $client_status_hash = { 'developmental'=>'revision', 'stable'=>'release'};
$client_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/;
@@ -1264,6 +1273,52 @@ daemon_log("INFO: ".$client_status_hash->{$client_status}.": $client_revision",
# delete old DBsqlite lock files
system('rm -f /tmp/gosa_si_lock*gosa-si-client*');
+# (re-)create FIFO
+if (-e $gosa_si_client_fifo) {
+ daemon_log("INFO: $gosa_si_client_fifo exists - deleting", 5);
+ if (1 != unlink($gosa_si_client_fifo)) {
+ daemon_log("ERROR: unable to delete '$gosa_si_client_fifo': $!", 1);
+ exit( 1 );
+ }
+}
+if (! defined POSIX::mkfifo($gosa_si_client_fifo, "0600")) {
+ daemon_log("ERROR: failed creating fifo: $!", 1);
+ exit( 1 );
+}
+
+# Just fork, if we are not in foreground mode
+if( ! $foreground ) {
+ if (! chdir('/')) {
+ daemon_log("ERROR: Can't chdir to /: $!");
+ exit( 1 );
+ }
+ umask( 0 );
+ $pid = fork;
+} else {
+ $pid = $$;
+}
+
+if( 0 != $pid ) {
+ # Parent: put our PID into the $pid_file
+ open( LOCK_FILE, ">$pid_file" );
+ print LOCK_FILE "$pid\n";
+ close( LOCK_FILE );
+ if( !$foreground ) {
+ exit( 0 );
+ }
+}
+else {
+ # Child
+ open( STDIN, '+>/dev/null' );
+ open( STDOUT, '+>&STDIN' );
+ open( STDERR, '+>&STDIN' );
+ if (! POSIX::setsid()) {
+ deamon_log("ERROR: Can't start a new session: $!", 1);
+ exit( 1 );
+ }
+ $poe_kernel->has_forked() if ($poe_kernel->can('has_forked'));
+}
+
# detect ip and mac address and complete host address
$client_address = $client_ip.":".$client_port;
my $network_interface= &get_interface_for_ip($client_ip);
# Find servers from config and DNS
&find_servers;
-# open fifo for non-gosa-si-client-msgs to gosa-si-server
-POSIX::mkfifo("$gosa_si_client_fifo", "0600");
-
-
POE::Session->create(
inline_states => {
_start => \&_start,
+ _stop => \&_stop,
_default => \&_default,
- sig_handler => \&sig_handler,
register_at_gosa_si_server => \®ister_at_gosa_si_server,
# trigger periodical tasks