libtransport.git Changeset - dcdaeff7f2a4

Changeset - dcdaeff7f2a4

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Sarang Bharadwaj - 13 years ago 2012-07-16 19:27:47
sarang.bh@gmail.com

changed error messages format

8 files changed with 30 insertions and 28 deletions:

backends/twitter/Requests/CreateFriendRequest.cpp

backends/twitter/Requests/DestroyFriendRequest.cpp

backends/twitter/Requests/DirectMessageRequest.cpp

backends/twitter/Requests/FetchFriends.cpp

backends/twitter/Requests/RetweetRequest.cpp

backends/twitter/Requests/StatusUpdateRequest.cpp

backends/twitter/Requests/TimelineRequest.cpp

backends/twitter/TwitterPlugin.cpp

0 comments (0 inline, 0 general)

backends/twitter/Requests/CreateFriendRequest.cpp

➞

Show inline comments

 #include "CreateFriendRequest.h"
 DEFINE_LOGGER(logger, "CreateFriendRequest")
 void CreateFriendRequest::run()
+{
 	LOG4CXX_INFO(logger, user << ": Sending follow request for " << frnd)
 	replyMsg = "";
 	success = twitObj->friendshipCreate(frnd, false);
 	if(success) twitObj->getLastWebResponse(replyMsg);
+}
 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);
+	}
+}

backends/twitter/Requests/DestroyFriendRequest.cpp

➞

Show inline comments

 #include "DestroyFriendRequest.h"
 DEFINE_LOGGER(logger, "DestroyFriendRequest")
 void DestroyFriendRequest::run()
+{
 	replyMsg = "";
 	success = twitObj->friendshipDestroy(frnd, false);
 	if(success) twitObj->getLastWebResponse(replyMsg);
+}
 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);
+	}
+}

backends/twitter/Requests/DirectMessageRequest.cpp

➞

Show inline comments

 #include "DirectMessageRequest.h"
 DEFINE_LOGGER(logger, "DirectMessageRequest")
 void DirectMessageRequest::run()
+{
 	replyMsg = "";
 	if(username != "") success = twitObj->directMessageSend(username, data, false);
 	else success = twitObj->directMessageGet(data); /* data will contain sinceId */
 	if(success) {
 		twitObj->getLastWebResponse( replyMsg );
 		if(username == "" ) messages = getDirectMessages( replyMsg );
+	}
+}
 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);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		else LOG4CXX_INFO(logger, user << " - " << replyMsg)
 		callBack(user, username, messages, error);
+	}
+}

backends/twitter/Requests/FetchFriends.cpp

➞

Show inline comments

 #include "FetchFriends.h"
 DEFINE_LOGGER(logger, "FetchFriends")
 void FetchFriends::run()
+{
 	replyMsg = "";
 	success = twitObj->friendsIdsGet(twitObj->getTwitterUsername());
 	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 );
+}
 void FetchFriends::finalize()
+{
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger,  user << " - " << replyMsg)
 		callBack(user, friends, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		callBack(user, friends, error);
+	}
+}

backends/twitter/Requests/RetweetRequest.cpp

➞

Show inline comments

 #include "RetweetRequest.h"
 DEFINE_LOGGER(logger, "RetweetRequest")
 void RetweetRequest::run()
+{
 	LOG4CXX_INFO(logger, user << " Retweeting " << data)
 	success = twitObj->retweetById( data );
+}
 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);
+	}
+}

backends/twitter/Requests/StatusUpdateRequest.cpp

➞

Show inline comments

 #include "StatusUpdateRequest.h"
 #include "../TwitterResponseParser.h"
 DEFINE_LOGGER(logger, "StatusUpdateRequest")
 void StatusUpdateRequest::run()
+{
 	replyMsg = "";
 	success = twitObj->statusUpdate(data);
 	if(success) {
 		twitObj->getLastWebResponse( replyMsg );
 		LOG4CXX_INFO(logger, user << "StatusUpdateRequest response " << replyMsg );
+	}
+}
 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);
+	}
+}

backends/twitter/Requests/TimelineRequest.cpp

➞

Show inline comments

 #include "TimelineRequest.h"
 DEFINE_LOGGER(logger, "TimelineRequest")
 void TimelineRequest::run()
+{
 	LOG4CXX_INFO(logger, "Sending timeline request for user " << userRequested)
 	if(userRequested != "") success = twitObj->timelineUserGet(false, false, 20, userRequested, false);
 	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);
+}
 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);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		callBack(user, userRequested, tweets, error);
+	}
+}

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 	sessions[user]->setTwitterUsername(username);
 	sessions[user]->setTwitterPassword(passwd);
 	sessions[user]->getOAuth().setConsumerKey(consumerKey);
 	sessions[user]->getOAuth().setConsumerSecret(consumerSecret);
+}
 void TwitterPlugin::OAuthFlowComplete(const std::string user, twitCurl *obj)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	delete sessions[user];
 	sessions[user] = obj->clone();
 	connectionState[user] = WAITING_FOR_PIN;
+}
 void TwitterPlugin::pinExchangeComplete(const std::string user, const std::string OAuthAccessTokenKey, const std::string OAuthAccessTokenSecret)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	sessions[user]->getOAuth().setOAuthTokenKey( OAuthAccessTokenKey );
 	sessions[user]->getOAuth().setOAuthTokenSecret( OAuthAccessTokenSecret );
 	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] = "";
 	mostRecentDirectMessageID[user] = "";
+}
 void TwitterPlugin::updateLastTweetID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	mostRecentTweetID[user] = ID;
+}
 std::string TwitterPlugin::getMostRecentTweetID(const std::string user)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::string ID = "-1";
 	if(onlineUsers.count(user)) ID = mostRecentTweetID[user];
 	return ID;
+}
 void TwitterPlugin::updateLastDMID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	mostRecentDirectMessageID[user] = ID;
 /************************************** Twitter response functions **********************************/
 void TwitterPlugin::statusUpdateResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Status Update successful", twitterMode[user] == CHATROOM ? adminNickName : "");
+	}
+}
 void TwitterPlugin::helpMessageResponse(std::string &user, std::string &msg)
+{
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						msg, twitterMode[user] == CHATROOM ? adminNickName : "");
+}
 void TwitterPlugin::clearRoster(const std::string user)
+{
 	if(buddies[user].size() == 0) return;
 	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)
+{
 	if(errMsg.length() == 0)
+	{
 		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 : "");
 	if(twitterMode[user] == CHATROOM) handleParticipantChanged(user, nickName[user], adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+}
 void TwitterPlugin::displayFriendlist(std::string &user, std::vector<User> &friends, std::string &errMsg)
+{
 	if(errMsg.length() == 0)
+	{
 		std::string userlist = "\n***************USER LIST****************\n";
 		for(int i=0 ; i < friends.size() ; i++) {
 			userlist += " - " + friends[i].getUserName() + " (" + friends[i].getScreenName() + ")\n";
+		}
 		userlist += "***************************************\n";
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							userlist, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
+}
 void TwitterPlugin::displayTweets(std::string &user, std::string &userRequested, std::vector<Status> &tweets , std::string &errMsg)
+{
 			if(cmp(msgID, messages[i].getID()) == -1) {
 				if(twitterMode[user] == MULTIPLECONTACT)
 					handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage(), "");
 				else
 					handleMessage(user, adminChatRoom, messages[i].getMessage() + " - <Direct Message>", messages[i].getSenderData().getScreenName());
 				if(cmp(maxID, messages[i].getID()) == -1) maxID = messages[i].getID();
+			}
+		}
 		if(maxID == getMostRecentDMID(user)) LOG4CXX_INFO(logger, "No new direct messages for " << user)
 		updateLastDMID(user, maxID);
+	}
+}
 void TwitterPlugin::createFriendResponse(std::string &user, std::string &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		return;
+	}
 	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);
+	}
+}
 void TwitterPlugin::deleteFriendResponse(std::string &user, std::string &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		return;
+	}
 	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);
+	}
+}
 void TwitterPlugin::RetweetResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Retweet successful", twitterMode[user] == CHATROOM ? adminNickName : "");
+	}
+}

0 comments (0 inline, 0 general)