proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-17 20:56:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fork_worker: refactor child exit

Browse Source 
* factor out duplicated code.
* drop final kill(-9, $$), since the POSIX:_exit call does not return
  (see man 2 _exit).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2018-11-20 09:46:31 +01:00 committed by Thomas Lamprecht
parent 7571d25b3d
commit edbb302ec8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PVE/RESTEnvironment.pm
View File

@ -579,22 +579,21 @@ sub fork_worker {
} }
&$function($upid); &$function($upid);
}; };
my ($msg, $exitcode);
my $err = $@; my $err = $@;
if ($err) { if ($err) {
chomp $err; chomp $err;
$err =~ s/\n/ /mg; $err =~ s/\n/ /mg;
syslog('err', $err); syslog('err', $err);
my $msg = "TASK ERROR: $err\n"; $msg = "TASK ERROR: $err\n";
POSIX::write($resfh, $msg, length($msg)); $exitcode = -1;
POSIX::close($resfh) if $sync;
POSIX::_exit(-1);
} else { } else {
my $msg = "TASK OK\n"; $msg = "TASK OK\n";
POSIX::write($resfh, $msg, length($msg)); $exitcode = 0;
POSIX::close($resfh) if $sync;
POSIX::_exit(0);
} }
kill(-9, $$); POSIX::write($resfh, $msg, length($msg));
POSIX::close($resfh) if $sync;
POSIX::_exit($exitcode);
} }
# parent # parent