parent
ee3645ac96
commit
c5a2235e7a
|
|
@ -88,10 +88,6 @@ LLApp* LLApp::sApplication = NULL;
|
|||
// and disables crashlogger
|
||||
bool LLApp::sDisableCrashlogger = false;
|
||||
|
||||
// Local flag for whether or not to do logging in signal handlers.
|
||||
//static
|
||||
bool LLApp::sLogInSignal = true;
|
||||
|
||||
// static
|
||||
// Keeps track of application status
|
||||
LLScalarCond<LLApp::EAppStatus> LLApp::sStatus{LLApp::APP_STATUS_STOPPED};
|
||||
|
|
@ -596,6 +592,10 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
|
|||
// We do the somewhat sketchy operation of blocking in here until the error handler
|
||||
// has gracefully stopped the app.
|
||||
|
||||
// FIXME(brad) - we are using this handler for asynchronous signals as well, so sLogInSignal is currently
|
||||
// disabled for safety. we need to find a way to selectively reenable it when it is safe.
|
||||
// see issue secondlife/viewer#2566
|
||||
|
||||
if (LLApp::sLogInSignal)
|
||||
{
|
||||
LL_INFOS() << "Signal handler - Got signal " << signum << " - " << apr_signal_description_get(signum) << LL_ENDL;
|
||||
|
|
|
|||
|
|
@ -339,8 +339,12 @@ private:
|
|||
friend void default_unix_signal_handler(int signum, siginfo_t *info, void *);
|
||||
#endif
|
||||
|
||||
public:
|
||||
static bool sLogInSignal;
|
||||
private:
|
||||
#ifdef LL_RELEASE_FOR_DOWNLOAD
|
||||
static constexpr bool sLogInSignal = false;
|
||||
#else
|
||||
static constexpr bool sLogInSignal = true;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // LL_LLAPP_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue