1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main: Handle SIGINT properly.

Browse Source 
As explained by http://www.cons.org/cracauer/sigint.html

Signed-off-by: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Geir Hauge 2014-03-31 09:52:03 +02:00 committed by Fedor Indutny
parent 8e823bcbe6
commit c61b0e9cbc
No known key found for this signature in database
GPG Key ID: FB0E1095B1797999
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node.cc
View File

@ -2793,9 +2793,9 @@ static void AtExit() {
} }
static void SignalExit(int signal) { static void SignalExit(int signo) {
uv_tty_reset_mode(); uv_tty_reset_mode();
_exit(128 + signal); raise(signo);
} }
@ -3131,12 +3131,15 @@ static void EnableDebugSignalHandler(int signo) {
} }
static void RegisterSignalHandler(int signal, void (*handler)(int signal)) { static void RegisterSignalHandler(int signal,
void (*handler)(int signal),
bool reset_handler = false) {
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = handler; sa.sa_handler = handler;
sa.sa_flags = reset_handler ? SA_RESETHAND : 0;
sigfillset(&sa.sa_mask); sigfillset(&sa.sa_mask);
sigaction(signal, &sa, NULL); CHECK_EQ(sigaction(signal, &sa, NULL), 0);
} }
@ -3423,8 +3426,8 @@ void Init(int* argc,
} }
// Ignore SIGPIPE // Ignore SIGPIPE
RegisterSignalHandler(SIGPIPE, SIG_IGN); RegisterSignalHandler(SIGPIPE, SIG_IGN);
RegisterSignalHandler(SIGINT, SignalExit); RegisterSignalHandler(SIGINT, SignalExit, true);
RegisterSignalHandler(SIGTERM, SignalExit); RegisterSignalHandler(SIGTERM, SignalExit, true);
#endif // __POSIX__ #endif // __POSIX__
V8::SetFatalErrorHandler(node::OnFatalError); V8::SetFatalErrorHandler(node::OnFatalError);