moonbridge
diff moonbridge_http.lua @ 288:524bb61496b5
Changed behavior of moonbridge_io.poll(...); Renamed moonbridge_io.sigterm_setup() to moonbridge_io.catch_sigterm(); Removed moonbridge_io.sigterm_received()
| author | jbe |
|---|---|
| date | Sun Jun 11 03:50:28 2017 +0200 (2017-06-11) |
| parents | 2fe69234cbe9 |
| children | 7751e4982916 |
line diff
1.1 --- a/moonbridge_http.lua Sun Jun 11 01:27:52 2017 +0200 1.2 +++ b/moonbridge_http.lua Sun Jun 11 03:50:28 2017 +0200 1.3 @@ -1094,11 +1094,13 @@ 1.4 return true -- success 1.5 end 1.6 -- wait for input: 1.7 - if not poll(socket_set, nil, idle_timeout, true) then 1.8 - if moonbridge_io.sigterm_received() then 1.9 + local ready, pollmsg, quit = poll(socket_set, nil, idle_timeout, true) 1.10 + if not ready then 1.11 + if quit then 1.12 return request_error(false, "408 Request Timeout", "Server shutdown") 1.13 + else 1.14 + return request_error(false, "408 Request Timeout", "Idle connection timed out") 1.15 end 1.16 - return request_error(false, "408 Request Timeout", "Idle connection timed out") 1.17 end 1.18 -- read headers (with timeout): 1.19 do