Skip to content
Snippets Groups Projects
Commit cdbfc8f6 authored by Sergey Linev's avatar Sergey Linev
Browse files

[webgui] duplicate log output on std output when WebGui.Console set

parent f08f6402
No related branches found
No related tags found
No related merge requests found
......@@ -15,6 +15,7 @@
#include <ROOT/RLogger.hxx>
#include "TString.h"
#include "TEnv.h"
#include <iostream>
ROOT::Experimental::RLogChannel &QtWebDisplayLog()
{
......@@ -35,21 +36,24 @@ RootWebPage::RootWebPage(QObject *parent) : QWebEnginePage(parent)
void RootWebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel lvl, const QString &message, int lineNumber,
const QString &src)
{
TString msg = TString::Format("%s:%d: %s", src.toLatin1().constData(), lineNumber,
message.toLatin1().constData());
switch (lvl) {
case InfoMessageLevel:
R__LOG_DEBUG(0, QtWebDisplayLog()) << msg;
if (fConsole > 0)
R__LOG_DEBUG(0, QtWebDisplayLog()) << Form("%s:%d: %s", src.toLatin1().constData(), lineNumber,
message.toLatin1().constData());
std::cout << msg << std::endl;
break;
case WarningMessageLevel:
if (fConsole > -1)
R__LOG_WARNING(QtWebDisplayLog()) << Form("%s:%d: %s", src.toLatin1().constData(), lineNumber,
message.toLatin1().constData());
R__LOG_WARNING(QtWebDisplayLog()) << msg;
if (fConsole > 0)
std::cout << msg << std::endl;
break;
case ErrorMessageLevel:
if (fConsole > -2)
R__LOG_ERROR(QtWebDisplayLog()) << Form("%s:%d: %s", src.toLatin1().constData(), lineNumber,
message.toLatin1().constData());
R__LOG_ERROR(QtWebDisplayLog()) << msg;
if (fConsole > 0)
std::cerr << msg << std::endl;
break;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment