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

changed error messages format

Browse source
This commit is contained in:
Sarang Bharadwaj 2012-07-16 22:57:47 +05:30
parent 96476b9a8a
commit dcdaeff7f2
8 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backends/twitter/Requests/CreateFriendRequest.cpp
View file

@ -14,14 +14,14 @@ void CreateFriendRequest::finalize()
if(!success) {
std::string error;
twitObj->getLastCurlError(error);
LOG4CXX_ERROR(logger, user << " Curl error: " << error)
LOG4CXX_ERROR(logger, user << " - Curl error: " << error)
callBack(user, frnd, error);
} else {
std::string error;
error = getErrorMessage(replyMsg);
if(error.length()) {
LOG4CXX_ERROR(logger, user << " " << error)
LOG4CXX_ERROR(logger, user << " " << replyMsg)
LOG4CXX_ERROR(logger, user << " - " << error)
//LOG4CXX_ERROR(logger, user << " " << replyMsg)
}
else LOG4CXX_INFO(logger, user << ": Now following " << frnd)
callBack(user, frnd, error);

4
backends/twitter/Requests/DestroyFriendRequest.cpp
View file

@ -13,12 +13,12 @@ void DestroyFriendRequest::finalize()
if(!success) {
std::string error;
twitObj->getLastCurlError(error);
LOG4CXX_ERROR(logger, user << " " << error)
LOG4CXX_ERROR(logger, user << " Curl error: " << error)
callBack(user, frnd, error);
} else {
std::string error;
error = getErrorMessage(replyMsg);
if(error.length()) LOG4CXX_ERROR(logger, user << " " << error)
if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
callBack(user, frnd, error);
}
}

2
backends/twitter/Requests/DirectMessageRequest.cpp
View file

@ -17,8 +17,8 @@ void DirectMessageRequest::run()
void DirectMessageRequest::finalize()
{
if(!success) {
LOG4CXX_ERROR(logger, user << ": Error while sending directed message to " << username );
twitObj->getLastCurlError( replyMsg );
LOG4CXX_ERROR(logger, user << " Curl error: " << replyMsg);
callBack(user, username, messages, replyMsg);
} else {
std::string error = getErrorMessage(replyMsg);

4
backends/twitter/Requests/FetchFriends.cpp
View file

@ -9,14 +9,14 @@ void FetchFriends::run()
if(!success) return;
twitObj->getLastWebResponse( replyMsg );
LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
//LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
std::vector<std::string> IDs = getIDs( replyMsg );
success = twitObj->userLookup(IDs, true);
if(!success) return;
twitObj->getLastWebResponse( replyMsg );
LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
//LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
friends = getUsers( replyMsg );
}

4
backends/twitter/Requests/RetweetRequest.cpp
View file

@ -11,12 +11,12 @@ void RetweetRequest::finalize()
replyMsg = "";
if(!success) {
twitObj->getLastCurlError( replyMsg );
LOG4CXX_ERROR(logger, user << " " << replyMsg)
LOG4CXX_ERROR(logger, user << " Curl error: " << replyMsg)
callBack(user, replyMsg);
} else {
twitObj->getLastWebResponse( replyMsg );
std::string error = getErrorMessage( replyMsg );
if(error.length()) LOG4CXX_ERROR(logger, user << " " << error)
if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
else LOG4CXX_INFO(logger, user << " " << replyMsg);
callBack(user, error);
}

4
backends/twitter/Requests/StatusUpdateRequest.cpp
View file

@ -16,11 +16,11 @@ void StatusUpdateRequest::finalize()
{
if(!success) {
twitObj->getLastCurlError( replyMsg );
LOG4CXX_ERROR(logger, user << ": CurlError - " << replyMsg );
LOG4CXX_ERROR(logger, user << " - Curl error: " << replyMsg );
callBack(user, replyMsg);
} else {
std::string error = getErrorMessage(replyMsg);
if(error.length()) LOG4CXX_ERROR(logger, user << ": " << error)
if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
else LOG4CXX_INFO(logger, "Updated status for " << user << ": " << data);
callBack(user, error);
}

7
backends/twitter/Requests/TimelineRequest.cpp
View file

@ -10,11 +10,8 @@ void TimelineRequest::run()
if(!success) return;
replyMsg = "";
twitObj->getLastWebResponse( replyMsg );
LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
//LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
tweets = getTimeline(replyMsg);
}
@ -22,7 +19,7 @@ void TimelineRequest::finalize()
{
if(!success) {
twitObj->getLastCurlError( replyMsg );
LOG4CXX_ERROR(logger, user << " - " << replyMsg)
LOG4CXX_ERROR(logger, user << " - Curl error: " << replyMsg)
callBack(user, userRequested, tweets, replyMsg);
} else {
std::string error = getErrorMessage(replyMsg);

27
backends/twitter/TwitterPlugin.cpp
View file

@ -450,9 +450,9 @@ void TwitterPlugin::pinExchangeComplete(const std::string user, const std::strin
connectionState[user] = CONNECTED;
twitterMode[user] = (mode)getTwitterMode(user);
//if(twitterMode[user] == MULTIPLECONTACT) {
if(twitterMode[user] == MULTIPLECONTACT) {
tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
//}
}
onlineUsers.insert(user);
mostRecentTweetID[user] = "";
@ -511,10 +511,10 @@ void TwitterPlugin::clearRoster(const std::string user)
std::set<std::string>::iterator it = buddies[user].begin();
while(it != buddies[user].end()) {
handleBuddyChanged(user, *it, *it, std::vector<std::string>(), pbnetwork::STATUS_NONE);
//handleBuddyRemoved(user, *it);
handleBuddyRemoved(user, *it);
it++;
}
//buddies[user].clear();
buddies[user].clear();
}
void TwitterPlugin::populateRoster(std::string &user, std::vector<User> &friends, std::string &errMsg)
@ -524,10 +524,11 @@ void TwitterPlugin::populateRoster(std::string &user, std::vector<User> &friends
for(int i=0 ; i<friends.size() ; i++) {
if(twitterMode[user] == MULTIPLECONTACT)
handleBuddyChanged(user, friends[i].getScreenName(), friends[i].getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
else if(twitterMode[user] == CHATROOM)
else if(twitterMode[user] == CHATROOM) {
handleParticipantChanged(user, friends[i].getScreenName(), adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
buddies[user].insert(friends[i].getScreenName());
}
}
} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
std::string("Error populating roster - ") + errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
@ -638,12 +639,14 @@ void TwitterPlugin::createFriendResponse(std::string &user, std::string &frnd, s
handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
std::string("You are now following ") + frnd, twitterMode[user] == CHATROOM ? adminNickName : "");
buddies[user].insert(frnd);
handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_NONE);
//buddies[user].insert(frnd);
//handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_NONE);
if(twitterMode[user] == MULTIPLECONTACT) {
handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
} else if(twitterMode[user] == CHATROOM) {
buddies[user].insert(frnd);
handleParticipantChanged(user, frnd, adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
}
}
@ -658,14 +661,16 @@ void TwitterPlugin::deleteFriendResponse(std::string &user, std::string &frnd, s
handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
std::string("You are not following ") + frnd + " anymore", twitterMode[user] == CHATROOM ? adminNickName : "");
if (twitterMode[user] == CHATROOM) {
handleParticipantChanged(user, frnd, adminLegacyName, 0, pbnetwork::STATUS_NONE);
}
buddies[user].erase(frnd);
handleBuddyRemoved(user, frnd);
//if(twitterMode[user] == MULTIPLECONTACT) {
}
//buddies[user].erase(frnd);
//handleBuddyRemoved(user, frnd);
//}
if(twitterMode[user] == MULTIPLECONTACT) {
handleBuddyRemoved(user, frnd);
}
}