ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when deleting Logger object, need to reset zmInitialized because we clear all the codes

This commit is contained in:
Isaac Connor 2018-03-29 12:24:00 -04:00
parent 3fe5bb6fe2
commit a56eafe796
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/zm_logger.cpp
View File

@ -98,7 +98,7 @@ Logger::Logger() :
char code[4] = ""; char code[4] = "";
for ( int i = DEBUG1; i <= DEBUG9; i++ ) { for ( int i = DEBUG1; i <= DEBUG9; i++ ) {
snprintf( code, sizeof(code), "DB%d", i ); snprintf(code, sizeof(code), "DB%d", i);
smCodes[i] = code; smCodes[i] = code;
smSyslogPriorities[i] = LOG_DEBUG; smSyslogPriorities[i] = LOG_DEBUG;
} }
@ -114,6 +114,7 @@ Logger::~Logger() {
terminate(); terminate();
smCodes.clear(); smCodes.clear();
smSyslogPriorities.clear(); smSyslogPriorities.clear();
smInitialised = false;
#if 0 #if 0
for ( StringMap::iterator itr = smCodes.begin(); itr != smCodes.end(); itr ++ ) { for ( StringMap::iterator itr = smCodes.begin(); itr != smCodes.end(); itr ++ ) {
smCodes.erase( itr ); smCodes.erase( itr );
@ -314,7 +315,7 @@ const std::string &Logger::id(const std::string &id) {
mIdArgs = mId.substr(pos); mIdArgs = mId.substr(pos);
} }
} }
return( mId ); return mId;
} }
Logger::Level Logger::level(Logger::Level level) { Logger::Level Logger::level(Logger::Level level) {
@ -335,7 +336,7 @@ Logger::Level Logger::level(Logger::Level level) {
if ( mEffectiveLevel > mLevel) if ( mEffectiveLevel > mLevel)
mEffectiveLevel = mLevel; mEffectiveLevel = mLevel;
} }
return( mLevel ); return mLevel;
} }
Logger::Level Logger::terminalLevel( Logger::Level terminalLevel ) { Logger::Level Logger::terminalLevel( Logger::Level terminalLevel ) {
@ -346,7 +347,7 @@ Logger::Level Logger::terminalLevel( Logger::Level terminalLevel ) {
if ( mTerminalLevel != terminalLevel ) if ( mTerminalLevel != terminalLevel )
mTerminalLevel = terminalLevel; mTerminalLevel = terminalLevel;
} }
return( mTerminalLevel ); return mTerminalLevel;
} }
Logger::Level Logger::databaseLevel( Logger::Level databaseLevel ) { Logger::Level Logger::databaseLevel( Logger::Level databaseLevel ) {
@ -360,7 +361,7 @@ Logger::Level Logger::databaseLevel( Logger::Level databaseLevel ) {
} // end if ( mDatabaseLevel != databaseLevel ) } // end if ( mDatabaseLevel != databaseLevel )
} // end if ( databaseLevel > NOOPT ) } // end if ( databaseLevel > NOOPT )
return( mDatabaseLevel ); return mDatabaseLevel;
} }
Logger::Level Logger::fileLevel( Logger::Level fileLevel ) { Logger::Level Logger::fileLevel( Logger::Level fileLevel ) {
@ -373,7 +374,7 @@ Logger::Level Logger::fileLevel( Logger::Level fileLevel ) {
if ( mFileLevel > NOLOG ) if ( mFileLevel > NOLOG )
openFile(); openFile();
} }
return( mFileLevel ); return mFileLevel;
} }
Logger::Level Logger::syslogLevel( Logger::Level syslogLevel ) { Logger::Level Logger::syslogLevel( Logger::Level syslogLevel ) {
@ -387,7 +388,7 @@ Logger::Level Logger::syslogLevel( Logger::Level syslogLevel ) {
openSyslog(); openSyslog();
} }
} }
return( mSyslogLevel ); return mSyslogLevel;
} }
void Logger::logFile( const std::string &logFile ) { void Logger::logFile( const std::string &logFile ) {
@ -449,9 +450,9 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
const char *classString = smCodes[level].c_str(); const char *classString = smCodes[level].c_str();
if ( level < PANIC || level > DEBUG9 ) if ( level < PANIC || level > DEBUG9 )
Panic( "Invalid logger level %d", level ); Panic("Invalid logger level %d", level);
gettimeofday( &timeVal, NULL ); gettimeofday(&timeVal, NULL);
#if 0 #if 0
if ( logRuntime ) { if ( logRuntime ) {
@ -463,8 +464,8 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
} else { } else {
#endif #endif
char *timePtr = timeString; char *timePtr = timeString;
timePtr += strftime( timePtr, sizeof(timeString), "%x %H:%M:%S", localtime(&timeVal.tv_sec) ); timePtr += strftime(timePtr, sizeof(timeString), "%x %H:%M:%S", localtime(&timeVal.tv_sec));
snprintf( timePtr, sizeof(timeString)-(timePtr-timeString), ".%06ld", timeVal.tv_usec ); snprintf(timePtr, sizeof(timeString)-(timePtr-timeString), ".%06ld", timeVal.tv_usec);
#if 0 #if 0
} }
#endif #endif
@ -553,7 +554,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
if ( level <= mSyslogLevel ) { if ( level <= mSyslogLevel ) {
int priority = smSyslogPriorities[level]; int priority = smSyslogPriorities[level];
//priority |= LOG_DAEMON; //priority |= LOG_DAEMON;
syslog( priority, "%s [%s] [%s]", classString, mId.c_str(), syslogStart ); syslog( priority, "%s [%d] [%s] [%s]", classString, priority, mId.c_str(), syslogStart );
} }
free(filecopy); free(filecopy);
@ -562,7 +563,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
zmDbClose(); zmDbClose();
if ( level <= PANIC ) if ( level <= PANIC )
abort(); abort();
exit( -1 ); exit(-1);
} }
} }