diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-05 13:29:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 13:29:54 -0700 |
| commit | 3aaab6ae65fb7f3fb56c8a418624391d1394b998 (patch) | |
| tree | 76f013ecb329954325e7e0e7640211afb8f44fa0 /indra | |
| parent | 24586f810eb7ef8048a55687333d51c53aa2bed8 (diff) | |
Ignore SIGHUP from SLPlugin processes. (#1627)
Under rosetta2, terminating SLPlugin child processes that would normally send SIGCHILD seem to be now sending SIGHUP. we should not terminate the viewer in this case.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 1388e81656..64497df875 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -586,9 +586,10 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) switch (signum) { case SIGCHLD: + case SIGHUP: if (LLApp::sLogInSignal) { - LL_INFOS() << "Signal handler - Got SIGCHLD from " << info->si_pid << LL_ENDL; + LL_INFOS() << "Signal handler - Got SIGCHLD or SIGHUP from " << info->si_pid << LL_ENDL; } return; @@ -603,11 +604,10 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) raise(signum); return; case SIGINT: - case SIGHUP: case SIGTERM: if (LLApp::sLogInSignal) { - LL_WARNS() << "Signal handler - Got SIGINT, HUP, or TERM, exiting gracefully" << LL_ENDL; + LL_WARNS() << "Signal handler - Got SIGINT, or TERM, exiting gracefully" << LL_ENDL; } // Graceful exit // Just set our state to quitting, not error |