tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5563 from Icinga/feature/jsonrpc-logging 

Implement additional logging for the JsonRpc class

fixes #5563
This commit is contained in:
Gunnar Beutner 2017-09-07 14:45:13 +02:00 committed by GitHub
parent ef8a6cad1d fbaaea5cbc
commit fc3d8636d4
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/remote/jsonrpc.cpp
View File

@ -20,9 +20,38 @@
#include "remote/jsonrpc.hpp"
#include "base/netstring.hpp"
#include "base/json.hpp"
#include "base/console.hpp"
#include "base/scriptglobal.hpp"
#include "base/convert.hpp"
using namespace icinga;
#ifdef I2_DEBUG
static bool GetDebugJsonRpcCached(void)
{
static int debugJsonRpc = -1;
if (debugJsonRpc != -1)
return debugJsonRpc;
debugJsonRpc = false;
Dictionary::Ptr internal = ScriptGlobal::Get("Internal", &Empty);
if (!internal)
return false;
Value vdebug;
if (!internal->Get("DebugJsonRpc", &vdebug))
return false;
debugJsonRpc = Convert::ToLong(vdebug);
return debugJsonRpc;
}
#endif /* I2_DEBUG */
/**
* Sends a message to the connected peer.
*
@ -31,6 +60,12 @@ using namespace icinga;
void JsonRpc::SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message)
{
String json = JsonEncode(message);
#ifdef I2_DEBUG
if (GetDebugJsonRpcCached())
std::cerr << ConsoleColorTag(Console_ForegroundBlue) << ">> " << json << ConsoleColorTag(Console_Normal) << "\n";
#endif /* I2_DEBUG */
NetString::WriteStringToStream(stream, json);
}
@ -44,6 +79,11 @@ StreamReadStatus JsonRpc::ReadMessage(const Stream::Ptr& stream, String *message
*message = jsonString;
#ifdef I2_DEBUG
if (GetDebugJsonRpcCached())
std::cerr << ConsoleColorTag(Console_ForegroundBlue) << "<< " << jsonString << ConsoleColorTag(Console_Normal) << "\n";
#endif /* I2_DEBUG */
return StatusNewItem;
}