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 34 insertions and 32 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

@@ @@ -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);

backends/twitter/Requests/DestroyFriendRequest.cpp

➞

Show inline comments

@@ @@ -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);
+	}
+}

backends/twitter/Requests/DirectMessageRequest.cpp

➞

Show inline comments

@@ @@ -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);

backends/twitter/Requests/FetchFriends.cpp

➞

Show inline comments

@@ @@ -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 );
+}

backends/twitter/Requests/RetweetRequest.cpp

➞

Show inline comments

@@ @@ -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);
+	}

backends/twitter/Requests/StatusUpdateRequest.cpp

➞

Show inline comments

@@ @@ -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);
+	}

backends/twitter/Requests/TimelineRequest.cpp

➞

Show inline comments

@@ @@ -8,13 +8,10 @@ void TimelineRequest::run() @@
 	else success = twitObj->timelineHomeGet(since_id);
 	if(!success) return;
 	replyMsg = "";
 	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);

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 	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<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)
 		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());
 				buddies[user].insert(friends[i].getScreenName());
+			}
+		}
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   std::string("Error populating roster - ") + errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	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);
+	}
+}
 	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);
+	}
+}

0 comments (0 inline, 0 general)