Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'rhansen/sig' (#117)

Browse source
This commit is contained in:
Sandro Jäckel 2020-05-26 20:52:08 +02:00
commit ac45f98bcd
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ddclient
View file

@ -834,10 +834,10 @@ if (!opt('daemon') && $programd =~ /d$/) {
} }
my $caught_hup = 0; my $caught_hup = 0;
my $caught_term = 0; my $caught_term = 0;
my $caught_kill = 0; my $caught_int = 0;
$SIG{'HUP'} = sub { $caught_hup = 1; }; $SIG{'HUP'} = sub { $caught_hup = 1; };
$SIG{'TERM'} = sub { $caught_term = 1; }; $SIG{'TERM'} = sub { $caught_term = 1; };
$SIG{'KILL'} = sub { $caught_kill = 1; }; $SIG{'INT'} = sub { $caught_int = 1; };
# don't fork() if foreground or force is on # don't fork() if foreground or force is on
if (opt('foreground') || opt('force')) { if (opt('foreground') || opt('force')) {
; ;
@ -893,7 +893,7 @@ do {
sendmail(); sendmail();
my $left = $daemon; my $left = $daemon;
while (($left > 0) && !$caught_hup && !$caught_term && !$caught_kill) { while (($left > 0) && !$caught_hup && !$caught_term && !$caught_int) {
my $delay = $left > 10 ? 10 : $left; my $delay = $left > 10 ? 10 : $left;
$0 = sprintf("%s - sleeping for %s seconds", $program, $left); $0 = sprintf("%s - sleeping for %s seconds", $program, $left);
@ -913,9 +913,9 @@ do {
} else { } else {
$result = $result eq 'OK' ? 0 : 1; $result = $result eq 'OK' ? 0 : 1;
} }
} while ($daemon && !$result && !$caught_term && !$caught_kill); } while ($daemon && !$result && !$caught_term && !$caught_int);
warning("caught SIGKILL; exiting") if $caught_kill; warning("caught SIGINT; exiting") if $caught_int;
unlink_pid(); unlink_pid();
sendmail(); sendmail();