libtransport.git Changeset - fcd00635e9d6

Changeset - fcd00635e9d6

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-12-07 17:00:03
hanzz.k@gmail.com

filter out sqlite3 error about already created buddies table. do not log XML by default

2 files changed with 4 insertions and 1 deletions:

spectrum/src/logging.cfg

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

spectrum/src/logging.cfg

➞

Show inline comments

@@ @@ -6,6 +6,9 @@ log4j.appender.R.File=/var/log/spectrum2/${jid}/spectrum2.log @@
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%d %-5p %c: %m%n
 # Disable XML category
 log4j.category.Component.XML = OFF

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -205,13 +205,13 @@ bool SQLite3Backend::createDatabase() { @@
 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) {
 		// This error is OK, because we try to create buddies table every time
 		// to detect if DB is created properly.
-		if (errMsg != "table buddies already exists") {
+		if (errMsg && std::string(errMsg).find("table buddies already exists") == std::string::npos) {
 			LOG4CXX_ERROR(logger, errMsg << " during statement " << query);
+		}
 		sqlite3_free(errMsg);
 		return false;
+	}
 	return true;

0 comments (0 inline, 0 general)