Skip to content

Commit

Permalink
Revert 'ed687f19f8459413145fabc56a462d7b38513ba8'.
Browse files Browse the repository at this point in the history
Conflicts:
 - src/core/main.lua
  • Loading branch information
eugeneia committed Jun 14, 2016
1 parent db9e343 commit c3b8672
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/core/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,8 @@ else
-- and set exit status accordingly.
local status, err, worker = S.waitpid(worker_pid)
assert(status, tostring(err))
if worker.WIFEXITED then exit_status = worker.EXITSTATUS
elseif worker.WIFSIGNALED then exit_status = 128 + worker.WTERMSIG
else
-- Stopping/continuing the worker is unsupported and causes shutdown.
S.kill(worker_pid, "hup")
exit_status = 255
print("Error: Unsupported worker state (stopped / continued).")
end
if worker.WIFEXITED then exit_status = worker.EXITSTATUS
else exit_status = 128 + worker.WTERMSIG end
else
-- Supervisor received exit signal: kill worker by sending SIGHUP and
-- and set exit status accordingly.
Expand Down

0 comments on commit c3b8672

Please sign in to comment.