Skip to content
Snippets Groups Projects
Commit 6a32a755 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-13034 Last string in logs should say 'Goodbye'

These logs were not logging for very long due to supressed logging system, no point showing them now
parent 056c41a4
No related branches found
No related tags found
No related merge requests found
...@@ -180,7 +180,7 @@ LLApp::~LLApp() ...@@ -180,7 +180,7 @@ LLApp::~LLApp()
if(mExceptionHandler != 0) delete mExceptionHandler; if(mExceptionHandler != 0) delete mExceptionHandler;
SUBSYSTEM_CLEANUP(LLCommon); SUBSYSTEM_CLEANUP_DBG(LLCommon);
} }
// static // static
......
...@@ -68,7 +68,7 @@ void ll_cleanup_apr() ...@@ -68,7 +68,7 @@ void ll_cleanup_apr()
{ {
gAPRInitialized = false; gAPRInitialized = false;
LL_INFOS("APR") << "Cleaning up APR" << LL_ENDL; LL_DEBUGS("APR") << "Cleaning up APR" << LL_ENDL;
LLThreadLocalPointerBase::destroyAllThreadLocalStorage(); LLThreadLocalPointerBase::destroyAllThreadLocalStorage();
......
...@@ -20,10 +20,13 @@ ...@@ -20,10 +20,13 @@
#include "llerror.h" #include "llerror.h"
#include "llerrorcontrol.h" #include "llerrorcontrol.h"
void log_subsystem_cleanup(const char* file, int line, const char* function, void log_subsystem_cleanup(LLError::ELevel level,
const char* file,
int line,
const char* function,
const char* classname) const char* classname)
{ {
LL_INFOS("Cleanup") << LLError::abbreviateFile(file) << "(" << line << "): " LL_VLOGS(level, "Cleanup") << LLError::abbreviateFile(file) << "(" << line << "): "
<< "calling " << classname << "::cleanupClass() in " << "calling " << classname << "::cleanupClass() in "
<< function << LL_ENDL; << function << LL_ENDL;
} }
...@@ -21,13 +21,22 @@ ...@@ -21,13 +21,22 @@
// shutdown schemes. // shutdown schemes.
#define SUBSYSTEM_CLEANUP(CLASSNAME) \ #define SUBSYSTEM_CLEANUP(CLASSNAME) \
do { \ do { \
log_subsystem_cleanup(__FILE__, __LINE__, BOOST_CURRENT_FUNCTION, #CLASSNAME); \ log_subsystem_cleanup(LLError::LEVEL_INFO, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, #CLASSNAME); \
CLASSNAME::cleanupClass(); \
} while (0)
#define SUBSYSTEM_CLEANUP_DBG(CLASSNAME) \
do { \
log_subsystem_cleanup(LLError::LEVEL_DEBUG, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, #CLASSNAME); \
CLASSNAME::cleanupClass(); \ CLASSNAME::cleanupClass(); \
} while (0) } while (0)
// Use ancient do { ... } while (0) macro trick to permit a block of // Use ancient do { ... } while (0) macro trick to permit a block of
// statements with the same syntax as a single statement. // statements with the same syntax as a single statement.
void log_subsystem_cleanup(const char* file, int line, const char* function, void log_subsystem_cleanup(LLError::ELevel level,
const char* file,
int line,
const char* function,
const char* classname); const char* classname);
#endif /* ! defined(LL_LLCLEANUP_H) */ #endif /* ! defined(LL_LLCLEANUP_H) */
...@@ -63,7 +63,7 @@ void LLCommon::cleanupClass() ...@@ -63,7 +63,7 @@ void LLCommon::cleanupClass()
sMasterThreadRecorder = NULL; sMasterThreadRecorder = NULL;
LLTrace::set_master_thread_recorder(NULL); LLTrace::set_master_thread_recorder(NULL);
LLThreadSafeRefCount::cleanupThreadSafeRefCount(); LLThreadSafeRefCount::cleanupThreadSafeRefCount();
SUBSYSTEM_CLEANUP(LLTimer); SUBSYSTEM_CLEANUP_DBG(LLTimer);
if (sAprInitialized) if (sAprInitialized)
{ {
ll_cleanup_apr(); ll_cleanup_apr();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment