From 815884e0d49620db8f9f60fc629a26ad2c666749 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 15 Oct 2012 14:27:47 -0700 Subject: MAINT-1551 : WIP : Trace IM messaging in and out. --- indra/newview/lleventpoll.cpp | 38 +++++++++++++++++++++++--------------- indra/newview/llimfloater.cpp | 4 +++- indra/newview/llimview.cpp | 7 +++++++ indra/newview/llspeakers.cpp | 4 ++++ indra/newview/llvoicechannel.cpp | 2 ++ 5 files changed, 39 insertions(+), 16 deletions(-) (limited to 'indra') diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 4f4d9a40b4..1cf3de8ef0 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -37,6 +37,7 @@ #include "llviewerregion.h" #include "message.h" #include "lltrans.h" +#include "llsdserialize.h" namespace { @@ -109,14 +110,14 @@ namespace const std::string& pollURL, const LLHost& sender) { LLHTTPClient::ResponderPtr result = new LLEventPollResponder(pollURL, sender); - llinfos << "LLEventPollResponder::start <" << sCount << "> " + llinfos << "Merov debug : LLEventPollResponder::start <" << sCount << "> " << pollURL << llendl; return result; } void LLEventPollResponder::stop() { - llinfos << "LLEventPollResponder::stop <" << mCount << "> " + llinfos << "Merov debug : LLEventPollResponder::stop <" << mCount << "> " << mPollURL << llendl; // there should be a way to stop a LLHTTPClient request in progress mDone = true; @@ -134,17 +135,17 @@ namespace LLViewerRegion *regionp = gAgent.getRegion(); if (!regionp) { - llerrs << "LLEventPoll initialized before region is added." << llendl; + llinfos << "Merov debug : LLEventPoll initialized before region is added." << llendl; } mSender = sender.getIPandPort(); - llinfos << "LLEventPoll initialized with sender " << mSender << llendl; + llinfos << "Merov debug : LLEventPoll initialized with sender " << mSender << llendl; makeRequest(); } LLEventPollResponder::~LLEventPollResponder() { stop(); - lldebugs << "LLEventPollResponder::~Impl <" << mCount << "> " + llinfos << "Merov debug : LLEventPollResponder::~Impl <" << mCount << "> " << mPollURL << llendl; } @@ -154,6 +155,7 @@ namespace const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer) { + llinfos << "Merov debug : LLEventPollResponder::completedRaw, status = " << status << ", reason = " << reason << llendl; if (status == HTTP_BAD_GATEWAY) { // These errors are not parsable as LLSD, @@ -172,8 +174,12 @@ namespace request["ack"] = mAcknowledge; request["done"] = mDone; - lldebugs << "LLEventPollResponder::makeRequest <" << mCount << "> ack = " - << LLSDXMLStreamer(mAcknowledge) << llendl; + llinfos << "Merov debug : viewer->sim : LLEventPollResponder::makeRequest <" << mCount + << "> ack = " << LLSDXMLStreamer(mAcknowledge) + << ", error = " << mErrorCount + << ", sender = " << mSender + << ", url = " << mPollURL + << ", done = " << mDone << llendl; LLHTTPClient::post(mPollURL, request, this); } @@ -183,12 +189,14 @@ namespace LLSD message; message["sender"] = mSender; message["body"] = content["body"]; + llinfos << "Merov debug : sim->viewer : LLEventPollResponder::handleMessage, msg_name = " << msg_name << ", message = " << LLSDOStreamer(message) << llendl; LLMessageSystem::dispatch(msg_name, message); } //virtual void LLEventPollResponder::error(U32 status, const std::string& reason) { + llinfos << "Merov debug : LLEventPollResponder::error, status = " << status << ", reason = " << reason << llendl; if (mDone) return; // A HTTP_BAD_GATEWAY (502) error is our standard timeout response @@ -207,11 +215,11 @@ namespace + mErrorCount * EVENT_POLL_ERROR_RETRY_SECONDS_INC , this); - llwarns << "Unexpected HTTP error. status: " << status << ", reason: " << reason << llendl; + llinfos << "Merov debug : Unexpected HTTP error. status: " << status << ", reason: " << reason << llendl; } else { - llwarns << "LLEventPollResponder::error: <" << mCount << "> got " + llinfos << "Merov debug : LLEventPollResponder::error: <" << mCount << "> got " << status << ": " << reason << (mDone ? " -- done" : "") << llendl; stop(); @@ -227,7 +235,7 @@ namespace // continue running. if(gAgent.getRegion() && gAgent.getRegion()->getHost().getIPandPort() == mSender) { - llwarns << "Forcing disconnect due to stalled main region event poll." << llendl; + llinfos << "Merov debug : Forcing disconnect due to stalled main region event poll." << llendl; LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection")); } } @@ -236,8 +244,8 @@ namespace //virtual void LLEventPollResponder::result(const LLSD& content) { - lldebugs << "LLEventPollResponder::result <" << mCount << ">" - << (mDone ? " -- done" : "") << llendl; + llinfos << "Merov debug : LLEventPollResponder::result <" << mCount << "> " + << (mDone ? " -- done" : "") << ", content = " << LLSDOStreamer(content) << llendl; if (mDone) return; @@ -246,7 +254,7 @@ namespace if (!content.get("events") || !content.get("id")) { - llwarns << "received event poll with no events or id key" << llendl; + llinfos << "Merov debug : received event poll with no events or id key" << llendl; makeRequest(); return; } @@ -256,11 +264,11 @@ namespace if(mAcknowledge.isUndefined()) { - llwarns << "LLEventPollResponder: id undefined" << llendl; + llinfos << "Merov debug : LLEventPollResponder: id undefined" << llendl; } // was llinfos but now that CoarseRegionUpdate is TCP @ 1/second, it'd be too verbose for viewer logs. -MG - lldebugs << "LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id " + llinfos << "Merov debug : LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id " << LLSDXMLStreamer(mAcknowledge) << ")" << llendl; LLSD::array_const_iterator i = events.beginArray(); diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 467f48600a..47e091a57c 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -59,6 +59,7 @@ #include "llviewerchat.h" #include "llnotificationmanager.h" #include "llautoreplace.h" +#include "llsdserialize.h" floater_showed_signal_t LLIMFloater::sIMFloaterShowedSignal; @@ -1208,11 +1209,12 @@ BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids) } data["method"] = "invite"; data["session-id"] = mSessionID; + llinfos << "Merov debug : viewer->sim : LLIMFloater::inviteToSession, session id = " << mSessionID << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post(url, data,new LLSessionInviteResponder(mSessionID)); } else { - llinfos << "LLIMFloater::inviteToSession -" + llinfos << "Merov debug : LLIMFloater::inviteToSession -" << " no need to invite agents for " << mDialog << llendl; // successful add, because everyone that needed to get added diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b45903835a..398584e005 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -63,6 +63,7 @@ #include "lltoolbarview.h" #include "llviewercontrol.h" #include "llviewerparcelmgr.h" +#include "llsdserialize.h" const static std::string ADHOC_NAME_SUFFIX(" Conference"); @@ -1316,6 +1317,7 @@ bool LLIMModel::sendStartSession( data["params"] = agents; + llinfos << "Merov debug : viewer-> sim : LLIMModel::sendStartSession, session id = " << temp_session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -2253,6 +2255,7 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload LLSD data; data["method"] = "accept invitation"; data["session-id"] = session_id; + llinfos << "Merov debug : viewer-> sim : LLIncomingCallDialog::processCallResponse, accept, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -2293,6 +2296,7 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload LLSD data; data["method"] = "decline invitation"; data["session-id"] = session_id; + llinfos << "Merov debug : viewer-> sim : LLIncomingCallDialog::processCallResponse, decline, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -2346,6 +2350,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response) LLSD data; data["method"] = "accept invitation"; data["session-id"] = session_id; + llinfos << "Merov debug : viewer-> sim : inviteUserResponse, accept, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -2381,6 +2386,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response) LLSD data; data["method"] = "decline invitation"; data["session-id"] = session_id; + llinfos << "Merov debug : viewer-> sim : inviteUserResponse, decline, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -3345,6 +3351,7 @@ public: LLSD data; data["method"] = "accept invitation"; data["session-id"] = session_id; + llinfos << "Merov debug : viewer-> sim : LLViewerChatterBoxInvitation, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 2d2b5202e0..19b99fef11 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -36,6 +36,7 @@ #include "llviewerobjectlist.h" #include "llvoavatar.h" #include "llworld.h" +#include "llsdserialize.h" const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f); const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f); @@ -785,6 +786,7 @@ void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id) //current value represents ability to type, so invert data["params"]["mute_info"]["text"] = !speakerp->mModeratorMutedText; + llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::toggleAllowTextChat, session id = " << getSessionID() << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post(url, data, new ModerationResponder(getSessionID())); } @@ -809,6 +811,7 @@ void LLIMSpeakerMgr::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmu data["params"]["mute_info"] = LLSD::emptyMap(); data["params"]["mute_info"]["voice"] = !unmute; + llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::moderateVoiceParticipant, session id = " << getSessionID() << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post( url, data, @@ -851,6 +854,7 @@ void LLIMSpeakerMgr::moderateVoiceSession(const LLUUID& session_id, bool disallo data["params"]["update_info"]["moderated_mode"] = LLSD::emptyMap(); data["params"]["update_info"]["moderated_mode"]["voice"] = disallow_voice; + llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::moderateVoiceSession, session id = " << session_id << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post(url, data, new ModerationResponder(session_id)); } diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index ceff75a0cc..62a43333dd 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -35,6 +35,7 @@ #include "llrecentpeople.h" #include "llviewercontrol.h" #include "llvoicechannel.h" +#include "llsdserialize.h" LLVoiceChannel::voice_channel_map_t LLVoiceChannel::sVoiceChannelMap; @@ -539,6 +540,7 @@ void LLVoiceChannelGroup::getChannelInfo() LLSD data; data["method"] = "call"; data["session-id"] = mSessionID; + llinfos << "Merov debug : viewer-> sim : LLVoiceChannelGroup::getChannelInfo, session id = " << mSessionID << ", data = " << LLSDOStreamer(data) << llendl; LLHTTPClient::post(url, data, new LLVoiceCallCapResponder(mSessionID)); -- cgit v1.2.3