proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 02:05:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Daemon: make sure we kill all child processes on TERM

Browse Source
This commit is contained in:
Dietmar Maurer 2015-01-02 09:31:21 +01:00
parent 517c11257c
commit 9403080a44
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/PVE/Daemon.pm
View File

@ -181,7 +181,7 @@ my $start_workers = sub {
}; };
my $terminate_server = sub { my $terminate_server = sub {
my ($self) = @_; my ($self, $allow_open_children) = @_;
$self->{terminate} = 1; # set flag to avoid worker restart $self->{terminate} = 1; # set flag to avoid worker restart
@ -201,7 +201,7 @@ my $terminate_server = sub {
} }
# if configured, leave children running on HUP # if configured, leave children running on HUP
return if $self->{got_hup_signal} && return if $allow_open_children &&
$self->{leave_children_open_on_reload}; $self->{leave_children_open_on_reload};
# else, send TERM to old workers # else, send TERM to old workers
@ -293,7 +293,7 @@ my $server_run = sub {
local $SIG{TERM} = sub { local $SIG{TERM} = sub {
local ($@, $!, $?); # do not overwrite error vars local ($@, $!, $?); # do not overwrite error vars
syslog('info', "received signal TERM"); syslog('info', "received signal TERM");
&$terminate_server($self); &$terminate_server($self, 0);
&$server_cleanup($self); &$server_cleanup($self);
&$old_sig_term(@_) if $old_sig_term; &$old_sig_term(@_) if $old_sig_term;
}; };
@ -302,7 +302,7 @@ my $server_run = sub {
local $SIG{QUIT} = sub { local $SIG{QUIT} = sub {
local ($@, $!, $?); # do not overwrite error vars local ($@, $!, $?); # do not overwrite error vars
syslog('info', "received signal QUIT"); syslog('info', "received signal QUIT");
&$terminate_server($self); &$terminate_server($self, 0);
&$server_cleanup($self); &$server_cleanup($self);
&$old_sig_quit(@_) if $old_sig_quit; &$old_sig_quit(@_) if $old_sig_quit;
}; };
@ -312,7 +312,7 @@ my $server_run = sub {
local ($@, $!, $?); # do not overwrite error vars local ($@, $!, $?); # do not overwrite error vars
syslog('info', "received signal INT"); syslog('info', "received signal INT");
$SIG{INT} = 'DEFAULT'; # allow to terminate now $SIG{INT} = 'DEFAULT'; # allow to terminate now
&$terminate_server($self); &$terminate_server($self, 0);
&$server_cleanup($self); &$server_cleanup($self);
&$old_sig_int(@_) if $old_sig_int; &$old_sig_int(@_) if $old_sig_int;
}; };
@ -322,7 +322,7 @@ my $server_run = sub {
syslog('info', "received signal HUP"); syslog('info', "received signal HUP");
$self->{got_hup_signal} = 1; $self->{got_hup_signal} = 1;
if ($self->{max_workers}) { if ($self->{max_workers}) {
&$terminate_server($self); &$terminate_server($self, 1);
} elsif ($self->can('hup')) { } elsif ($self->can('hup')) {
eval { $self->hup() }; eval { $self->hup() };
warn $@ if $@; warn $@ if $@;
@ -358,7 +358,7 @@ my $server_run = sub {
if ($err) { if ($err) {
syslog ('err', "ERROR: $err"); syslog ('err', "ERROR: $err");
&$terminate_server($self); &$terminate_server($self, 1);
if (my $wait_time = $self->{restart_on_error}) { if (my $wait_time = $self->{restart_on_error}) {
$self->restart_daemon($wait_time); $self->restart_daemon($wait_time);