From dcdaeff7f2a458187899c81f6cf67d714444f717 Mon Sep 17 00:00:00 2001 From: Sarang Bharadwaj Date: Mon, 16 Jul 2012 22:57:47 +0530 Subject: [PATCH] changed error messages format --- .../twitter/Requests/CreateFriendRequest.cpp | 6 ++-- .../twitter/Requests/DestroyFriendRequest.cpp | 4 +-- .../twitter/Requests/DirectMessageRequest.cpp | 2 +- backends/twitter/Requests/FetchFriends.cpp | 4 +-- backends/twitter/Requests/RetweetRequest.cpp | 4 +-- .../twitter/Requests/StatusUpdateRequest.cpp | 4 +-- backends/twitter/Requests/TimelineRequest.cpp | 9 ++--- backends/twitter/TwitterPlugin.cpp | 33 +++++++++++-------- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/backends/twitter/Requests/CreateFriendRequest.cpp b/backends/twitter/Requests/CreateFriendRequest.cpp index 9b5f4bd4..163daacc 100644 --- a/backends/twitter/Requests/CreateFriendRequest.cpp +++ b/backends/twitter/Requests/CreateFriendRequest.cpp @@ -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); diff --git a/backends/twitter/Requests/DestroyFriendRequest.cpp b/backends/twitter/Requests/DestroyFriendRequest.cpp index e6d42369..f7a6628f 100644 --- a/backends/twitter/Requests/DestroyFriendRequest.cpp +++ b/backends/twitter/Requests/DestroyFriendRequest.cpp @@ -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); } } diff --git a/backends/twitter/Requests/DirectMessageRequest.cpp b/backends/twitter/Requests/DirectMessageRequest.cpp index c9779ef0..5798f06a 100644 --- a/backends/twitter/Requests/DirectMessageRequest.cpp +++ b/backends/twitter/Requests/DirectMessageRequest.cpp @@ -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); diff --git a/backends/twitter/Requests/FetchFriends.cpp b/backends/twitter/Requests/FetchFriends.cpp index 6f703007..533c244a 100644 --- a/backends/twitter/Requests/FetchFriends.cpp +++ b/backends/twitter/Requests/FetchFriends.cpp @@ -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 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 ); } diff --git a/backends/twitter/Requests/RetweetRequest.cpp b/backends/twitter/Requests/RetweetRequest.cpp index 9c70657c..e771fa7a 100644 --- a/backends/twitter/Requests/RetweetRequest.cpp +++ b/backends/twitter/Requests/RetweetRequest.cpp @@ -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); } diff --git a/backends/twitter/Requests/StatusUpdateRequest.cpp b/backends/twitter/Requests/StatusUpdateRequest.cpp index 0fc35652..e393bd3b 100644 --- a/backends/twitter/Requests/StatusUpdateRequest.cpp +++ b/backends/twitter/Requests/StatusUpdateRequest.cpp @@ -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); } diff --git a/backends/twitter/Requests/TimelineRequest.cpp b/backends/twitter/Requests/TimelineRequest.cpp index 19a3a367..1510dd37 100644 --- a/backends/twitter/Requests/TimelineRequest.cpp +++ b/backends/twitter/Requests/TimelineRequest.cpp @@ -8,13 +8,10 @@ void TimelineRequest::run() else success = twitObj->timelineHomeGet(since_id); 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); diff --git a/backends/twitter/TwitterPlugin.cpp b/backends/twitter/TwitterPlugin.cpp index c907f901..c55132d6 100644 --- a/backends/twitter/TwitterPlugin.cpp +++ b/backends/twitter/TwitterPlugin.cpp @@ -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) { - tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3))); - //} + 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::iterator it = buddies[user].begin(); while(it != buddies[user].end()) { handleBuddyChanged(user, *it, *it, std::vector(), pbnetwork::STATUS_NONE); - //handleBuddyRemoved(user, *it); + handleBuddyRemoved(user, *it); it++; } - //buddies[user].clear(); + buddies[user].clear(); } void TwitterPlugin::populateRoster(std::string &user, std::vector &friends, std::string &errMsg) @@ -524,9 +524,10 @@ void TwitterPlugin::populateRoster(std::string &user, std::vector &friends for(int i=0 ; i(), 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()); + 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(), pbnetwork::STATUS_NONE); + + //buddies[user].insert(frnd); + //handleBuddyChanged(user, frnd, frnd, std::vector(), pbnetwork::STATUS_NONE); if(twitterMode[user] == MULTIPLECONTACT) { handleBuddyChanged(user, frnd, frnd, std::vector(), 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); } - buddies[user].erase(frnd); - handleBuddyRemoved(user, frnd); - //if(twitterMode[user] == MULTIPLECONTACT) { - // handleBuddyRemoved(user, frnd); - //} + //buddies[user].erase(frnd); + //handleBuddyRemoved(user, frnd); + if(twitterMode[user] == MULTIPLECONTACT) { + handleBuddyRemoved(user, frnd); + } }