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

backport change to not initialize db in logger which fixes small memleak.

This commit is contained in:
Isaac Connor 2021-03-31 12:05:30 -04:00
parent 790cdf879a
commit 4fb73505b9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_db.h
View File

@ -43,6 +43,8 @@ class zmDbRow {
extern MYSQL dbconn; extern MYSQL dbconn;
extern RecursiveMutex db_mutex; extern RecursiveMutex db_mutex;
extern bool zmDbConnected;
bool zmDbConnect(); bool zmDbConnect();
void zmDbClose(); void zmDbClose();

2
src/zm_logger.cpp
View File

@ -361,7 +361,7 @@ Logger::Level Logger::databaseLevel(Logger::Level databaseLevel) {
databaseLevel = limit(databaseLevel); databaseLevel = limit(databaseLevel);
if ( mDatabaseLevel != databaseLevel ) { if ( mDatabaseLevel != databaseLevel ) {
if ( (databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG) ) { // <= NOLOG would be NOOPT if ( (databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG) ) { // <= NOLOG would be NOOPT
if ( !zmDbConnect() ) { if ( !zmDbConnected ) {
databaseLevel = NOLOG; databaseLevel = NOLOG;
} }
} // end if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG ) } // end if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )