libtransport.git Changeset - fed816d2554e

Changeset - fed816d2554e

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 14 years ago 2011-08-06 15:40:46
hanzz.k@gmail.com

initialize m_conn

3 files changed with 11 insertions and 9 deletions:

include/transport/mysqlbackend.h

spectrum/src/sample.cfg

src/mysqlbackend.cpp

0 comments (0 inline, 0 general)

include/transport/mysqlbackend.h

➞

Show inline comments

@@ @@ -93,7 +93,7 @@ class MySQLBackend : public StorageBackend @@
 	private:
 		bool exec(const std::string &query);
-		MYSQL *m_conn;
 		MYSQL m_conn;
 		Config *m_config;
 		std::string m_prefix;

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -26,6 +26,6 @@ default_avatar=catmelonhead.jpg @@
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
-type = none # or "none" without database backend
+type = mysql # or "none" without database backend
 database = test.sql
 prefix=icq

src/mysqlbackend.cpp

➞

Show inline comments

 MySQLBackend::MySQLBackend(Config *config) {
 	m_config = config;
-	m_conn = NULL;
+	mysql_init(&m_conn);
 	m_prefix = CONFIG_STRING(m_config, "database.prefix");
+}
 MySQLBackend::~MySQLBackend(){
 	if (m_conn) {
 		mysql_close(m_conn);
+	}
 	mysql_close(&m_conn);
+}
 bool MySQLBackend::connect() {
 	LOG4CXX_INFO(logger, "Connecting database " << CONFIG_STRING(m_config, "database.database"));
 	if (!mysql_real_connect(m_conn, CONFIG_STRING(m_config, "database.server").c_str(),
 	LOG4CXX_INFO(logger, "Connecting MySQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
 		CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
 		", port " << CONFIG_INT(m_config, "database.port")
 	);
 	if (!mysql_real_connect(&m_conn, CONFIG_STRING(m_config, "database.server").c_str(),
 					   CONFIG_STRING(m_config, "database.user").c_str(),
 					   CONFIG_STRING(m_config, "database.password").c_str(),
 					   CONFIG_STRING(m_config, "database.database").c_str(),
 					   CONFIG_INT(m_config, "database.port"), NULL, 0)) {
 		LOG4CXX_ERROR(logger, "Can't connect database: " << mysql_error(m_conn));
+		LOG4CXX_ERROR(logger, "Can't connect database: " << mysql_error(&m_conn));
 		return false;
+	}

0 comments (0 inline, 0 general)