From 8aa0fbaa1ea357e04f93abd31cb7e192b6749065 Mon Sep 17 00:00:00 2001
From: Paulchen Panther <Paulchen--Panter@gmx.net>
Date: Sat, 17 Dec 2016 22:14:30 +0100
Subject: [PATCH] Logger output in WebUI (#337)

* expanding logging result array of JSON request

* matching web logging output to console
---
 assets/webconfig/js/content_logging.js     | 16 ++++++++++--
 libsrc/jsonserver/JsonClientConnection.cpp | 29 ++++++++++++++++------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/assets/webconfig/js/content_logging.js b/assets/webconfig/js/content_logging.js
index d205cece..370c268e 100644
--- a/assets/webconfig/js/content_logging.js
+++ b/assets/webconfig/js/content_logging.js
@@ -34,9 +34,21 @@ $(document).ready(function() {
 				messages = (event.response.result.messages);
 				for(var idx=0; idx<messages.length; idx++)
 				{
-					msg = messages[idx];
-					$("#logmessages").html($("#logmessages").html()+"\n <code>"+msg+"</code>");
+					app_name = messages[idx].appName;
+					logger_name = messages[idx].loggerName;
+					function_ = messages[idx].function;
+					line = messages[idx].line;
+					file_name = messages[idx].fileName;
+					msg = messages[idx].message;
+					level_string = messages[idx].levelString;
 					
+					var debug = "";
+					
+					if(level_string == "DEBUG") {
+						debug = "&lt;"+file_name+":"+line+":"+function_+"()&gt; ";
+					}
+					
+					$("#logmessages").html($("#logmessages").html()+"\n <code>"+"["+app_name+" "+logger_name+"] &lt;"+level_string+"&gt; "+debug+msg+"</code>");
 				}
 				if($("#btn_autoscroll").hasClass('btn-success')){
 					$('#logmessages').stop().animate({
diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp
index 85c5a682..a1c6d2d4 100644
--- a/libsrc/jsonserver/JsonClientConnection.cpp
+++ b/libsrc/jsonserver/JsonClientConnection.cpp
@@ -1257,8 +1257,8 @@ void JsonClientConnection::handleLoggingCommand(const QJsonObject& message, cons
 
 void JsonClientConnection::incommingLogMessage(Logger::T_LOG_MESSAGE msg)
 {
-	QJsonObject result;
-	QJsonArray messages;
+	QJsonObject result, message;
+	QJsonArray messageArray;
 
 	if (!_streaming_logging_activated)
 	{
@@ -1266,24 +1266,37 @@ void JsonClientConnection::incommingLogMessage(Logger::T_LOG_MESSAGE msg)
 		QVector<Logger::T_LOG_MESSAGE>* logBuffer = LoggerManager::getInstance()->getLogMessageBuffer();
 		for(int i=0; i<logBuffer->length(); i++)
 		{
-			//std::cout << "------- " << logBuffer->at(i).message.toStdString() << std::endl;
-			messages.append(logBuffer->at(i).message);
+			message["appName"] = logBuffer->at(i).appName;
+			message["loggerName"] = logBuffer->at(i).loggerName;
+			message["function"] = logBuffer->at(i).function;
+			message["line"] = QString::number(logBuffer->at(i).line);
+			message["fileName"] = logBuffer->at(i).fileName;
+			message["message"] = logBuffer->at(i).message;
+			message["levelString"] = logBuffer->at(i).levelString;
+			
+			messageArray.append(message);
 		}
 	}
 	else
 	{
-		//std::cout << "------- " << msg.message.toStdString() << std::endl;
-		messages.append(msg.message);
+		message["appName"] = msg.appName;
+		message["loggerName"] = msg.loggerName;
+		message["function"] = msg.function;
+		message["line"] = QString::number(msg.line);
+		message["fileName"] = msg.fileName;
+		message["message"] = msg.message;
+		message["levelString"] = msg.levelString;
+		
+		messageArray.append(message);
 	}
 
-	result["messages"] = messages;
+	result.insert("messages", messageArray);
 	_streaming_logging_reply["result"] = result;
 
 	// send the result
 	sendMessage(_streaming_logging_reply);
 }
 
-
 void JsonClientConnection::handleNotImplemented()
 {
 	sendErrorReply("Command not implemented");