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

Slack: More logging

Browse source
This commit is contained in:
Jan Kaluza 2016-02-19 12:00:54 +01:00
parent 3bfd7407b9
commit 05b24bbd6e
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libtransport/UserManager.cpp
View file

@ -119,6 +119,7 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {
m_storageBackend->setUserOnline(user->getUserInfo().id, false);
}
LOG4CXX_INFO(logger, user->getJID().toBare().toString() << ": Disconnecting user");
onUserDestroyed(user);
delete user;
#ifndef WIN32

3
libtransport/UserRegistration.cpp
View file

@ -66,15 +66,18 @@ bool UserRegistration::unregisterUser(const std::string &barejid) {
// This user is not registered, nothing to do
if (!registered) {
LOG4CXX_WARN(logger, "Tried to unregister already unregistered user " << barejid);
return false;
}
LOG4CXX_INFO(logger, "Unregistering user " << barejid);
// Remove user from database
m_storageBackend->removeUser(userInfo.id);
// Disconnect the user
User *user = m_userManager->getUser(barejid);
if (user) {
LOG4CXX_INFO(logger, "Disconnecting user " << barejid);
m_userManager->removeUser(user);
}

2
spectrum/src/frontends/slack/SlackUser.cpp
View file

@ -67,7 +67,7 @@ void SlackUser::disconnectUser(const std::string &error, Swift::SpectrumErrorPay
}
m_session->handleDisconnected();
m_session->sendMessageToAll("Maybe you have provided wrong 3rd-party network account information. In that case, you can use ```.spectrum2 register ...``` command again with corrected data. You can also try using ```.spectrum2 reconnect``` to reconnect.");
m_session->sendMessageToAll("Maybe you have provided wrong 3rd-party network account information.");
static_cast<SlackUserManager *>(m_userManager)->moveTempSession(m_jid.toString(), m_session);
m_session = NULL;
}

9
spectrum/src/frontends/slack/SlackUserRegistration.cpp
View file

@ -74,6 +74,13 @@ std::string SlackUserRegistration::createOAuth2URL(const std::vector<std::string
m_auths[oauth2->getState()] = oauth2;
m_authsData[oauth2->getState()] = args;
if (args.size() >= 3) {
LOG4CXX_INFO(logger, "Generating OAUth2 URL with slack_channel=" << args[0] << ", 3rd_party_account=" << args[1]);
}
else {
LOG4CXX_WARN(logger, "Generating OAUth2 URL with too few arguments");
}
return url;
}
@ -182,7 +189,7 @@ std::string SlackUserRegistration::handleOAuth2Code(const std::string &code, con
value = access_token;
m_storageBackend->getUserSetting(user.id, "access_token", type, value);
LOG4CXX_INFO(logger, "Registered Slack user " << user.jid);
LOG4CXX_INFO(logger, "Registered Slack user " << user.jid << ", slack_channel=" << slackChannel);
if (oauth2) {
m_auths.erase(state);