libtransport.git Changeset - 6efc5e055b12

Changeset - 6efc5e055b12

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-07-28 22:51:37
hanzz.k@gmail.com

More logging and don't use DB on every presence

2 files changed with 8 insertions and 1 deletions:

src/networkpluginserver.cpp

src/rosterstorage.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	BOOST_FOREACH(const std::string &g, b->getGroups()) {
 		buddy.add_group(g);
+	}
 	buddy.set_status(pbnetwork::STATUS_NONE);
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPayload &item) {
 	User *user = b->getRosterManager()->getUser();
 	dynamic_cast<LocalBuddy *>(b)->setAlias(item.getName());
 	dynamic_cast<LocalBuddy *>(b)->setGroups(item.getGroups());
 	user->getRosterManager()->storeBuddy(b);
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user->getJID().toBare());
 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	BOOST_FOREACH(const std::string &g, b->getGroups()) {
 		buddy.add_group(g);
+	}
 	buddy.set_status(pbnetwork::STATUS_NONE);
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyAdded(Buddy *buddy, const Swift::RosterItemPayload &item) {
 	handleBuddyUpdated(buddy, item);

src/rosterstorage.cpp

➞

Show inline comments

 /**
  * XMPP - libpurple transport
+ *
  * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/rosterstorage.h"
 #include "transport/buddy.h"
 #include "transport/user.h"
 #include "transport/storagebackend.h"
 #include "transport/logging.h"
 DEFINE_LOGGER(logger, "RosterStorage");
 namespace Transport {
 // static void save_settings(gpointer k, gpointer v, gpointer data) {
 // 	PurpleValue *value = (PurpleValue *) v;
 // 	std::string key((char *) k);
 // 	SaveData *s = (SaveData *) data;
 // 	AbstractUser *user = s->user;
 // 	long id = s->id;
 // 	if (purple_value_get_type(value) == PURPLE_TYPE_BOOLEAN) {
 // 		if (purple_value_get_boolean(value))
 // 			Transport::instance()->sql()->addBuddySetting(user->storageId(), id, key, "1", purple_value_get_type(value));
 // 		else
 // 			Transport::instance()->sql()->addBuddySetting(user->storageId(), id, key, "0", purple_value_get_type(value));
 // 	}
 // 	else if (purple_value_get_type(value) == PURPLE_TYPE_STRING) {
 // 		const char *str = purple_value_get_string(value);
 // 		Transport::instance()->sql()->addBuddySetting(user->storageId(), id, key, str ? str : "", purple_value_get_type(value));
 // 	}
 // }
 //
 // static gboolean storeAbstractSpectrumBuddy(gpointer key, gpointer v, gpointer data) {
 // 	AbstractUser *user = (AbstractUser *) data;
 // 	AbstractSpectrumBuddy *s_buddy = (AbstractSpectrumBuddy *) v;
@@ @@ -90,65 +93,70 @@ void RosterStorage::removeBuddy(Buddy *buddy) { @@
 		m_storageBackend->removeBuddy(buddy->getID());
+	}
+}
 void RosterStorage::storeBuddy(Buddy *buddy) {
 	if (!buddy) {
 		return;
+	}
 	if (buddy->getName().empty()) {
 		return;
+	}
 	m_buddies[buddy->getName()] = buddy;
 	m_storageTimer->start();
+}
 bool RosterStorage::storeBuddies() {
 	if (m_buddies.size() == 0) {
 		return false;
+	}
 	m_storageBackend->beginTransaction();
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		LOG4CXX_INFO(logger, "storing 1");
 		Buddy *buddy = (*it).second;
 		BuddyInfo buddyInfo;
 		buddyInfo.alias = buddy->getAlias();
 		LOG4CXX_INFO(logger, "storing 1.5");
 		buddyInfo.legacyName = buddy->getName();
 		buddyInfo.groups = buddy->getGroups();
 		LOG4CXX_INFO(logger, "storing 2");
 		buddyInfo.subscription = buddy->getSubscription() == Buddy::Ask ? "ask" : "both";
 		buddyInfo.id = buddy->getID();
 		buddyInfo.flags = buddy->getFlags();
 		buddyInfo.settings["icon_hash"].s = buddy->getIconHash();
 		buddyInfo.settings["icon_hash"].type = TYPE_STRING;
 		LOG4CXX_INFO(logger, "storing 3");
 		// Buddy is in DB
 		if (buddyInfo.id != -1) {
 			m_storageBackend->updateBuddy(m_user->getUserInfo().id, buddyInfo);
+		}
 		else {
 			buddyInfo.id = m_storageBackend->addBuddy(m_user->getUserInfo().id, buddyInfo);
 			buddy->setID(buddyInfo.id);
+		}
 		LOG4CXX_INFO(logger, "storing 4");
 // 		Log("buddyListSaveNode", id << " " << name << " " << alias << " " << s_buddy->getSubscription());
 // 		if (s_buddy->getBuddy() && id != -1) {
 // 			PurpleBuddy *buddy = s_buddy->getBuddy();
 // 			SaveData *s = new SaveData;
 // 			s->user = user;
 // 			s->id = id;
 // 			g_hash_table_foreach(buddy->node.settings, save_settings, s);
 // 			delete s;
 // 		}
+	}
 	m_buddies.clear();
 	m_storageBackend->commitTransaction();
 	return true;
+}
 void RosterStorage::removeBuddyFromQueue(Buddy *buddy) {
 	m_buddies.erase(buddy->getName());
+}
+}

0 comments (0 inline, 0 general)