diff options
| author | Jan Kloetzke <[email protected]> | 2012-07-31 21:08:31 +0200 |
|---|---|---|
| committer | Jan Kloetzke <[email protected]> | 2012-07-31 21:21:49 +0200 |
| commit | 03985084e42e262bac1b7c48a97c31db97348f1d (patch) | |
| tree | 73ba2066f08aa478d48cc836e107ea7102329f9c /erts/etc/win32/erlsrv | |
| parent | 92eb89bd630e822cfc93a07dad7d6c7a25f45d63 (diff) | |
| download | otp-03985084e42e262bac1b7c48a97c31db97348f1d.tar.gz otp-03985084e42e262bac1b7c48a97c31db97348f1d.tar.bz2 otp-03985084e42e262bac1b7c48a97c31db97348f1d.zip | |
erlsrv: gracefully stop emulator on Windows shutdown
Windows will send the SERVICE_CONTROL_SHUTDOWN event to the service control
handler when shutting down the system. Instead of ignoring the event, erlsrv
will now invoke the stop action. Likewise, the Erlang emulator (and it's port
drivers) must not quit upon reception of the CTRL_SHUTDOWN_EVENT event in the
console control handler.
Diffstat (limited to 'erts/etc/win32/erlsrv')
| -rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_service.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/etc/win32/erlsrv/erlsrv_service.c b/erts/etc/win32/erlsrv/erlsrv_service.c index 242e2905a9..8b734b0c05 100644 --- a/erts/etc/win32/erlsrv/erlsrv_service.c +++ b/erts/etc/win32/erlsrv/erlsrv_service.c @@ -104,11 +104,10 @@ static VOID WINAPI handler(DWORD control){ log_debug(buffer); switch(control){ case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: set_stop_pending(30000,1); SetEvent(eventStop); return; - case SERVICE_CONTROL_SHUTDOWN: - return; default: reset_current(); break; |