![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 091402f963c0916a547b2f829aa5f39f9c54eb1d..9d574ed0670cad58248da6b5e49d0d25e6450be8 100755 (executable)
}
+sub clean_shutdown
+{
+ unlink($pid_file) if (-w $pid_file);
+ unlink($packages_list_under_construction) if (-w $packages_list_under_construction);
+}
-#=== FUNCTION ================================================================
-# NAME: sig_int_handler
-# PARAMETERS: signal - string - signal arose from system
-# RETURNS: nothing
-# DESCRIPTION: handels tasks to be done befor signal becomes active
-#===============================================================================
-sub sig_int_handler {
+sub sig_int_or_term_handler
+{
my ($signal) = @_;
+ daemon_log("Got SIG${signal} - shutting down gosa-si-server", 1);
+ clean_shutdown();
+ POE::Kernel->signal('gosa-si_server_session', 'KILL');
+ POE::Kernel->signal('TCP_SERVER', 'KILL');
+ return 1;
+}
-# if (defined($ldap_handle)) {
-# $ldap_handle->disconnect;
-# }
- # TODO alle verbliebenden ldap verbindungen aus allen heaps beenden
-
-
- daemon_log("shutting down gosa-si-server", 1);
- system("kill `ps -C gosa-si-server -o pid=`");
+sub sig_warn_handler
+{
+ my @loc = caller(0);
+ daemon_log( "SIGWARN line " . $loc[2] . ": " . $_[0], 1 );
+ 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{'USR1'} = 'IGNORE';
sub check_key_and_xml_validity {
my ($crypted_msg, $module_key, $session_id) = @_;
$sql_statement = "DELETE FROM known_server WHERE hostname='$address'";
$res = $known_server_db->del_dbentry($sql_statement);
daemon_log("$session_id WARNING: failed 2x to send a message to host '$address', delete host from known_server", 3);
+
+ # Remove the registered clients of the server as well
+ $sql_statement = "DELETE FROM foreign_clients WHERE regserver='$address'";
+ $res = $foreign_clients_db->del_dbentry($sql_statement);
}
else {
$sql_statement = "UPDATE known_server SET status='$new_status', timestamp='$timestamp' WHERE hostname='$address'";
}
-sub sig_handler {
- my ($kernel, $signal) = @_[KERNEL, ARG0] ;
- daemon_log("0 INFO got signal '$signal'", 1);
- $kernel->sig_handled();
- return;
-}
-
-
sub msg_to_decrypt {
my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
my $session_id = $session->ID;
sub session_start {
my ($kernel) = $_[KERNEL];
+ $kernel->alias_set('gosa-si_server_session');
$global_kernel = $kernel;
$kernel->yield('register_at_foreign_servers');
$kernel->yield('create_fai_server_db', $fai_server_tn );
$kernel->yield('create_fai_release_db', $fai_release_tn );
$kernel->yield('watch_for_next_tasks');
- $kernel->sig(USR1 => "sig_handler");
$kernel->sig(USR2 => "recreate_packages_db");
$kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
$kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay);
if ($opsi_enabled eq "true") {
$kernel->delay_set('watch_for_opsi_jobs', $job_queue_opsi_delay);
}
-
}
+sub session_stop {
+ my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
+ $kernel->alias_remove($heap->{alias});
+ $kernel->alarm_remove_all();
+ $kernel->post($heap->{child_session}, '_stop');
+}
sub watch_for_done_jobs {
#CHECK: $heap for what?
my ($kernel, $heap) = @_[KERNEL, HEAP];
# select outgoing messages
- my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )";
+ my $timestamp= &get_time();
+ my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' AND delivery_time<$timestamp)";
#&daemon_log("0 DEBUG: $sql", 7);
my $res = $messaging_db->exec_statement( $sql_statement );
$SIG{CHLD} = 'IGNORE';
-# 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 /: $!";
+ if (! chdir('/')) {
+ daemon_log("Can't chdir to /: $!", 1);
+ exit( 1 );
+ }
+ umask( 0 );
$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 ) {
+ # Parent: put PID into the $pid_file
open( LOCK_FILE, ">$pid_file" );
print LOCK_FILE "$pid\n";
close( LOCK_FILE );
if( !$foreground ) {
- exit( 0 )
- };
+ exit( 0 );
+}
}
+else {
+ # Child
+ open( STDIN, '+>/dev/null' );
+ open( STDOUT, '+>&STDIN' );
+ open( STDERR, '+>&STDIN' );
+ if (! POSIX::setsid()) {
+ daemon_log("Can't start a new session: $!");
+ exit( 1 );
+ }
+ $poe_kernel->has_forked() if ($poe_kernel->can('has_forked'));
+}
+
# parse head url and revision from svn
my $server_status_hash = { 'developmental'=>'revision', 'stable'=>'release'};
@@ -3493,8 +3508,8 @@ daemon_log("0 INFO: start socket for incoming xml messages at port '$server_port
POE::Session->create(
inline_states => {
_start => \&session_start,
+ _stop => \&session_stop,
register_at_foreign_servers => \®ister_at_foreign_servers,
- sig_handler => \&sig_handler,
next_task => \&next_task,
task_result => \&handle_task_result,
task_done => \&handle_task_done,