From 77d16777c448cc4e09e0ddb1408260044f925c0b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 10 Feb 2011 11:33:32 -0700 Subject: Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid spam when debugging plugins --- linden/indra/llplugin/llpluginmessagepipe.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'linden/indra/llplugin/llpluginmessagepipe.cpp') diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp index 8168b32..26cc9c0 100755 --- a/linden/indra/llplugin/llpluginmessagepipe.cpp +++ b/linden/indra/llplugin/llpluginmessagepipe.cpp @@ -82,10 +82,10 @@ bool LLPluginMessagePipeOwner::writeMessageRaw(const std::string &message) } else { - LL_WARNS("Plugin") << "dropping message: " << message << LL_ENDL; + LL_WARNS("PluginPipe") << "dropping message: " << message << LL_ENDL; result = false; } - + return result; } @@ -179,18 +179,18 @@ bool LLPluginMessagePipe::pumpOutput() { // write any outgoing messages size = (apr_size_t)mOutput.size(); - + setSocketTimeout(0); - -// LL_INFOS("Plugin") << "before apr_socket_send, size = " << size << LL_ENDL; + +// LL_INFOS("PluginPipe") << "before apr_socket_send, size = " << size << LL_ENDL; status = apr_socket_send( mSocket->getSocket(), (const char*)mOutput.data(), &size); -// LL_INFOS("Plugin") << "after apr_socket_send, size = " << size << LL_ENDL; - +// LL_INFOS("PluginPipe") << "after apr_socket_send, size = " << size << LL_ENDL; + if(status == APR_SUCCESS) { // success @@ -277,15 +277,15 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout) { size = request_size; -// LL_INFOS("Plugin") << "before apr_socket_recv, size = " << size << LL_ENDL; +// LL_INFOS("PluginPipe") << "before apr_socket_recv, size = " << size << LL_ENDL; status = apr_socket_recv( - mSocket->getSocket(), - input_buf, + mSocket->getSocket(), + input_buf, &size); -// LL_INFOS("Plugin") << "after apr_socket_recv, size = " << size << LL_ENDL; - +// LL_INFOS("PluginPipe") << "after apr_socket_recv, size = " << size << LL_ENDL; + if(size > 0) { LLMutexLock lock(&mInputMutex); @@ -379,7 +379,7 @@ void LLPluginMessagePipe::processInput(void) } else { - LL_WARNS("Plugin") << "!mOwner" << LL_ENDL; + LL_WARNS("PluginPipe") << "!mOwner" << LL_ENDL; } } mInputMutex.unlock(); -- cgit v1.1