@@ -21,6 +21,7 @@ Database::Database(mySQLData sqlData) { + config = sqlData; mysql_host = sqlData.host; mysql_user = sqlData.user; mysql_password = sqlData.pass; @@ -28,6 +29,14 @@ Database::Database(mySQLData sqlData) mysql_port = sqlData.port; } +void Database::logLastDatabaseError() +{ + // Log this error. + Log log(LOGFILE, config); + stringstream msg; + msg << "Database query failed: " << error; + log.putLog(3, "SQL", msg.str()); +} bool Database::initConnection() { @@ -68,8 +77,8 @@ bool Database::setQuery(MYSQL* init, string query) } // Query failed. - error = mysql_error(init); + logLastDatabaseError(); return 0; } @@ -99,6 +108,11 @@ string Database::sGetQuery(string query) mysql_free_result(res); return result.str(); } + + // Query failed. + error = mysql_error(init); + logLastDatabaseError(); + return "NULL"; } @@ -120,6 +134,11 @@ unsigned int Database::getNumOfResults(string query) mysql_free_result(res); return num; } + + // Query failed. + error = mysql_error(init); + logLastDatabaseError(); + return 0; } @@ -149,6 +168,11 @@ string Database::sGetQuery2(string query) mysql_free_result(res); return result.str(); } + + // Query failed. + error = mysql_error(init); + logLastDatabaseError(); + return "NULL"; } @@ -164,6 +188,9 @@ bool Database::clearSensorData() } // Query failed. + error = mysql_error(init); + logLastDatabaseError(); + return 0; } @@ -183,6 +210,9 @@ bool Database::clearServiceData() } // Query failed. + error = mysql_error(init); + logLastDatabaseError(); + return 0; } src/database/Database.cpp @@ -60,6 +60,11 @@ class Database //! The port we want to use for MySQL connection. (0 means standard port) int mysql_port; + + mySQLData config; + + void logLastDatabaseError(); + public: //! Constructor. Converts sqlData values to single variables. Database(mySQLData sqlData); src/database/Database.h f3209df92373948bc28e0d1b8bc13260dd7e5da8 Lennart Koopmann lennart@sundaysister.(none) http://github.com/lennartkoopmann/scopeport-server/commit/8b98bace2cce48edb042a49b3777986286882d47 8b98bace2cce48edb042a49b3777986286882d47 2009-11-05T12:54:19-08:00 2009-11-05T12:54:19-08:00 Now logging SQL errors db7bd706d367306bd914fa4aaa0eea3503d045f7 Lennart Koopmann lennart@sundaysister.(none)