ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert back to qDebug, we're not ready for qInfo yet

pull/341/head
Michael Zanetti 2020-09-07 19:44:48 +02:00
parent 8aa2feb7c6
commit befda2ec00
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/integrations/python/pynymealogginghandler.h
View File

@ -53,7 +53,9 @@ static PyObject * PyNymeaLoggingHandler_info(PyNymeaLoggingHandler* self, PyObje
Py_XDECREF(str); Py_XDECREF(str);
strings.append(bytes); 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; Py_RETURN_NONE;
} }

2
libnymea-core/integrations/pythonintegrationplugin.cpp
View File

@ -330,7 +330,7 @@ bool PythonIntegrationPlugin::loadScript(const QString &scriptFile)
Py_DECREF(args); Py_DECREF(args);
// Override stdout and stderr // 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<PyStdOutHandler*>(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args)); PyStdOutHandler*stdOutHandler = reinterpret_cast<PyStdOutHandler*>(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args));
Py_DECREF(args); Py_DECREF(args);
PySys_SetObject("stdout", (PyObject*)stdOutHandler); PySys_SetObject("stdout", (PyObject*)stdOutHandler);