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

Merge pull request #1707 from connortechnology/log_failed_log_insert 

log failed sql when db insert fails.
This commit is contained in:
Andrew Bauer 2016-12-20 09:11:24 -06:00 committed by GitHub
parent 68cd4c2ce5 6fa3b25d2a
commit d4c4b999e9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_logger.cpp
View File

@ -618,8 +618,10 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line ); snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line );
if ( mysql_query( &mDbConnection, sql ) ) if ( mysql_query( &mDbConnection, sql ) )
{ {
Level tempDatabaseLevel = mDatabaseLevel;
databaseLevel( NOLOG ); databaseLevel( NOLOG );
Error( "Can't insert log entry: %s", mysql_error( &mDbConnection ) ); Error( "Can't insert log entry: sql(%s) error(%s)", sql, mysql_error( &mDbConnection ) );
databaseLevel(tempDatabaseLevel);
} }
} }
if ( level <= mSyslogLevel ) if ( level <= mSyslogLevel )