diff --git a/src/sqlite3backend.cpp b/src/sqlite3backend.cpp index d9f65d11c591f137eafa986d332cd5dc40a018e1..d75b52d61c0ea6f0ced2aa655303f0f06373476a 100644 --- a/src/sqlite3backend.cpp +++ b/src/sqlite3backend.cpp @@ -20,6 +20,9 @@ #include "transport/sqlite3backend.h" #include +#include "log4cxx/logger.h" + +using namespace log4cxx; #define SQLITE_DB_VERSION 3 #define CHECK_DB_RESPONSE(stmt) \ @@ -31,7 +34,7 @@ // Prepare the SQL statement #define PREP_STMT(sql, str) \ if(sqlite3_prepare_v2(m_db, std::string(str).c_str(), -1, &sql, NULL)) { \ - onStorageError(str, (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); \ + LOG4CXX_ERROR(logger, str<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); \ return false; \ } @@ -52,18 +55,19 @@ #define GET_INT(STATEMENT) sqlite3_column_int(STATEMENT, STATEMENT##_id_get++) #define GET_STR(STATEMENT) (const char *) sqlite3_column_text(STATEMENT, STATEMENT##_id_get++) #define EXECUTE_STATEMENT(STATEMENT, NAME) if(sqlite3_step(STATEMENT) != SQLITE_DONE) {\ - onStorageError(NAME, (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));\ + LOG4CXX_ERROR(logger, NAME<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));\ } using namespace boost; namespace Transport { +static LoggerPtr logger = Logger::getLogger("SQLite3Backend"); + SQLite3Backend::SQLite3Backend(Config *config) { m_config = config; m_db = NULL; m_prefix = CONFIG_STRING(m_config, "database.prefix"); - std::cout << "SQLITE3 " << this << "\n"; } SQLite3Backend::~SQLite3Backend(){ @@ -96,6 +100,7 @@ SQLite3Backend::~SQLite3Backend(){ } bool SQLite3Backend::connect() { + LOG4CXX_INFO(logger, "Opening database " << CONFIG_STRING(m_config, "database.database")); if (sqlite3_open(CONFIG_STRING(m_config, "database.database").c_str(), &m_db)) { sqlite3_close(m_db); return false; @@ -186,7 +191,7 @@ bool SQLite3Backend::exec(const std::string &query) { char *errMsg = 0; int rc = sqlite3_exec(m_db, query.c_str(), NULL, 0, &errMsg); if (rc != SQLITE_OK) { - onStorageError(query, errMsg); + LOG4CXX_ERROR(logger, errMsg << " during statement " << query); sqlite3_free(errMsg); return false; } @@ -203,7 +208,7 @@ void SQLite3Backend::setUser(const UserInfo &user) { sqlite3_bind_int (m_setUser, 6, user.vip); if(sqlite3_step(m_setUser) != SQLITE_DONE) { - onStorageError("setUser query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "setUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); } } @@ -225,7 +230,7 @@ bool SQLite3Backend::getUser(const std::string &barejid, UserInfo &user) { } if (ret != SQLITE_DONE) { - onStorageError("getUser query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "getUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); } return false; @@ -246,7 +251,7 @@ long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) { BIND_INT(m_addBuddy, buddyInfo.flags); if(sqlite3_step(m_addBuddy) != SQLITE_DONE) { - onStorageError("addBuddy query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "addBuddy query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return -1; } @@ -347,7 +352,7 @@ bool SQLite3Backend::getBuddies(long id, std::list &roster) { } // if (ret != SQLITE_DONE) { -// onStorageError("getBuddiesSettings query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); +// LOG4CXX_ERROR(logger, "getBuddiesSettings query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); // return false; // } @@ -355,7 +360,7 @@ bool SQLite3Backend::getBuddies(long id, std::list &roster) { } if (ret != SQLITE_DONE) { - onStorageError("getBuddies query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "getBuddies query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return false; } @@ -366,28 +371,28 @@ bool SQLite3Backend::removeUser(long id) { sqlite3_reset(m_removeUser); sqlite3_bind_int(m_removeUser, 1, id); if(sqlite3_step(m_removeUser) != SQLITE_DONE) { - onStorageError("removeUser query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "removeUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return false; } sqlite3_reset(m_removeUserSettings); sqlite3_bind_int(m_removeUserSettings, 1, id); if(sqlite3_step(m_removeUserSettings) != SQLITE_DONE) { - onStorageError("removeUserSettings query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "removeUserSettings query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return false; } sqlite3_reset(m_removeUserBuddies); sqlite3_bind_int(m_removeUserBuddies, 1, id); if(sqlite3_step(m_removeUserBuddies) != SQLITE_DONE) { - onStorageError("removeUserBuddies query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "removeUserBuddies query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return false; } sqlite3_reset(m_removeUserBuddiesSettings); sqlite3_bind_int(m_removeUserBuddiesSettings, 1, id); if(sqlite3_step(m_removeUserBuddiesSettings) != SQLITE_DONE) { - onStorageError("removeUserBuddiesSettings query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); + LOG4CXX_ERROR(logger, "removeUserBuddiesSettings query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); return false; }