stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

log4cxx everywhere :)

Browse source
This commit is contained in:
HanzZ 2011-06-23 17:23:37 +02:00
parent 8720eb9678
commit 99d1c435b9
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/conversation.cpp
View file

@ -25,14 +25,18 @@
#include "transport/transport.h"
#include "transport/buddy.h"
#include "transport/rostermanager.h"
#include "log4cxx/logger.h"
using namespace log4cxx;
namespace Transport {
// static LoggerPtr logger = Logger::getLogger("Conversation");
Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {
m_legacyName = legacyName;
m_conversationManager->addConversation(this);
m_muc = isMUC;
std::cout << "new conversation " << legacyName << "\n";
}
Conversation::~Conversation() {
@ -52,11 +56,9 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
if (nickname.empty()) {
Buddy *buddy = m_conversationManager->getUser()->getRosterManager()->getBuddy(m_legacyName);
if (buddy) {
std::cout << m_legacyName << " 222222\n";
message->setFrom(buddy->getJID());
}
else {
std::cout << m_legacyName << " 1111111\n";
// TODO: escape from and setFrom
}
}
@ -90,8 +92,10 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i
Swift::StatusShow s((Swift::StatusShow::Type) status);
if (s.getType() == Swift::StatusShow::None)
if (s.getType() == Swift::StatusShow::None) {
presence->setType(Swift::Presence::Unavailable);
}
presence->setShow(s.getType());
Swift::MUCUserPayload *p = new Swift::MUCUserPayload ();

7
src/conversationmanager.cpp
View file

@ -27,9 +27,14 @@
#include "Swiften/Roster/SetRosterRequest.h"
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "log4cxx/logger.h"
using namespace log4cxx;
namespace Transport {
static LoggerPtr logger = Logger::getLogger("ConversationManager");
ConversationManager::ConversationManager(User *user, Component *component){
m_user = user;
m_component = component;
@ -37,6 +42,7 @@ ConversationManager::ConversationManager(User *user, Component *component){
ConversationManager::~ConversationManager() {
while(!m_convs.empty()) {
LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Removing conversation " << (*m_convs.begin()).first);
delete (*m_convs.begin()).second;
m_convs.erase(m_convs.begin());
}
@ -44,6 +50,7 @@ ConversationManager::~ConversationManager() {
void ConversationManager::addConversation(Conversation *conv) {
m_convs[conv->getLegacyName()] = conv;
LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Adding conversation " << conv->getLegacyName());
}
void ConversationManager::removeConversation(Conversation *conv) {

10
src/storageresponder.cpp
View file

@ -27,12 +27,17 @@
#include "Swiften/Swiften.h"
#include "transport/usermanager.h"
#include "transport/user.h"
#include "log4cxx/logger.h"
using namespace log4cxx;
using namespace Swift;
using namespace boost;
namespace Transport {
static LoggerPtr logger = Logger::getLogger("StorageResponder");
StorageResponder::StorageResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager) : Swift::Responder<PrivateStorage>(router) {
m_storageBackend = storageBackend;
m_userManager = userManager;
@ -44,6 +49,7 @@ StorageResponder::~StorageResponder() {
bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::PrivateStorage> payload) {
User *user = m_userManager->getUser(from.toBare().toString());
if (!user) {
LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
return true;
}
@ -51,7 +57,7 @@ bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID
int type = 0;
std::string value = "";
m_storageBackend->getUserSetting(user->getUserInfo().id, "storage", type, value);
std::cout << value << "\n";
LOG4CXX_INFO(logger, from.toBare().toString() << ": Sending jabber:iq:storage");
sendResponse(from, id, boost::shared_ptr<PrivateStorage>(new PrivateStorage(boost::shared_ptr<RawXMLPayload>(new RawXMLPayload(value)))));
return true;
@ -61,12 +67,14 @@ bool StorageResponder::handleSetRequest(const Swift::JID& from, const Swift::JID
User *user = m_userManager->getUser(from.toBare().toString());
if (!user) {
sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
return true;
}
StorageSerializer serializer;
std::string value = serializer.serializePayload(boost::dynamic_pointer_cast<Storage>(payload->getPayload()));
m_storageBackend->updateUserSetting(user->getUserInfo().id, "storage", value);
LOG4CXX_INFO(logger, from.toBare().toString() << ": Storing jabber:iq:storage");
sendResponse(from, id, boost::shared_ptr<PrivateStorage>());
return true;
}