libtransport.git Changeset - 9cf00ddc59a0

Changeset - 9cf00ddc59a0

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Daniel Henninger - 13 years ago 2012-02-19 09:10:36
daniel@vorpalcloud.org

Cleaned up code a bit, primarily adding more exception catching in proper locations.

1 file changed with 18 insertions and 2 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

@@ @@ -57,7 +57,14 @@ bool PQXXBackend::connect() { @@
 	str += CONFIG_STRING(m_config, "database.database") + " ";
 	str += "user=" + CONFIG_STRING(m_config, "database.user") + " ";
 	try {
 		m_conn = new pqxx::connection(str);
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	createDatabase();
@@ @@ -152,6 +159,7 @@ void PQXXBackend::setUser(const UserInfo &user) { @@
 	if (!CONFIG_STRING(m_config, "database.encryption_key").empty()) {
 		encrypted = Util::encryptPassword(encrypted, CONFIG_STRING(m_config, "database.encryption_key"));
+	}
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		txn.exec("INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES "
 			+ "(" + quote(txn, user.jid) + ","
@@ @@ -162,6 +170,10 @@ void PQXXBackend::setUser(const UserInfo &user) { @@
 			+ "NOW(),"
 			+ (user.vip ? "'true'" : "'false'") +")");
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 bool PQXXBackend::getUser(const std::string &barejid, UserInfo &user) {
 	try {
+}
 long PQXXBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		pqxx::result r = txn.exec("INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES "
 			+ "(" + pqxx::to_string(userId) + ","
 				+ quote(txn,  buddyInfo.settings.find("icon_hash")->second.s) + ")");
+		}
 	txn.commit();
 		return id;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
 		return -1;
+	}
+}
 void PQXXBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
 	try {

0 comments (0 inline, 0 general)