From befda2ec00fa1563e0893803845ac3400641b21b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 7 Sep 2020 19:44:48 +0200 Subject: [PATCH] Revert back to qDebug, we're not ready for qInfo yet --- libnymea-core/integrations/python/pynymealogginghandler.h | 4 +++- libnymea-core/integrations/pythonintegrationplugin.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnymea-core/integrations/python/pynymealogginghandler.h b/libnymea-core/integrations/python/pynymealogginghandler.h index a34ca452..fe2e8970 100644 --- a/libnymea-core/integrations/python/pynymealogginghandler.h +++ b/libnymea-core/integrations/python/pynymealogginghandler.h @@ -53,7 +53,9 @@ static PyObject * PyNymeaLoggingHandler_info(PyNymeaLoggingHandler* self, PyObje Py_XDECREF(str); strings.append(bytes); } - qCInfo(QLoggingCategory(self->category)).noquote() << strings.join(' '); + // FIXME: We'll want to use qCInfo() here but the system can't really deal with that yet + // Move from qCDebug() to qCInfo() when we support controlling that + qCDebug(QLoggingCategory(self->category)).noquote() << strings.join(' '); Py_RETURN_NONE; } diff --git a/libnymea-core/integrations/pythonintegrationplugin.cpp b/libnymea-core/integrations/pythonintegrationplugin.cpp index 799b050e..4bcec22a 100644 --- a/libnymea-core/integrations/pythonintegrationplugin.cpp +++ b/libnymea-core/integrations/pythonintegrationplugin.cpp @@ -330,7 +330,7 @@ bool PythonIntegrationPlugin::loadScript(const QString &scriptFile) Py_DECREF(args); // Override stdout and stderr - args = Py_BuildValue("(si)", category.toUtf8().data(), QtMsgType::QtInfoMsg); + args = Py_BuildValue("(si)", category.toUtf8().data(), QtMsgType::QtDebugMsg); PyStdOutHandler*stdOutHandler = reinterpret_cast(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args)); Py_DECREF(args); PySys_SetObject("stdout", (PyObject*)stdOutHandler);