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

Merge PR #404: Clean up PyStdoutHandler on shutdown

pull/416/head
Jenkins nymea 2021-04-19 11:38:25 +02:00
parent 8d2ebedbdf 317467a05b
commit d35765cb72
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,9 @@ PythonIntegrationPlugin::~PythonIntegrationPlugin()
s_plugins.take(this);
Py_XDECREF(m_pluginModule);
Py_DECREF(m_nymeaModule);
Py_XDECREF(m_logger);
Py_XDECREF(m_stdOutHandler);
Py_XDECREF(m_stdErrHandler);
Py_EndInterpreter(m_threadState);
@ -357,23 +360,24 @@ bool PythonIntegrationPlugin::loadScript(const QString &scriptFile)
QString category = metadata.pluginName();
category.replace(0, 1, category[0].toUpper());
PyObject *args = Py_BuildValue("(s)", category.toUtf8().data());
PyNymeaLoggingHandler *logger = reinterpret_cast<PyNymeaLoggingHandler*>(PyObject_CallObject((PyObject*)&PyNymeaLoggingHandlerType, args));
m_logger = PyObject_CallObject((PyObject*)&PyNymeaLoggingHandlerType, args);
Py_DECREF(args);
// Override stdout and stderr
args = Py_BuildValue("(si)", category.toUtf8().data(), QtMsgType::QtDebugMsg);
PyStdOutHandler*stdOutHandler = reinterpret_cast<PyStdOutHandler*>(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args));
m_stdOutHandler = PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args);
Py_DECREF(args);
PySys_SetObject("stdout", (PyObject*)stdOutHandler);
PySys_SetObject("stdout", m_stdOutHandler);
args = Py_BuildValue("(si)", category.toUtf8().data(), QtMsgType::QtWarningMsg);
PyStdOutHandler*stdErrHandler = reinterpret_cast<PyStdOutHandler*>(PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args));
PySys_SetObject("stderr", (PyObject*)stdErrHandler);
m_stdErrHandler = PyObject_CallObject((PyObject*)&PyStdOutHandlerType, args);
PySys_SetObject("stderr", m_stdErrHandler);
Py_DECREF(args);
int loggerAdded = PyModule_AddObject(m_pluginModule, "logger", reinterpret_cast<PyObject*>(logger));
int loggerAdded = PyModule_AddObject(m_pluginModule, "logger", m_logger);
if (loggerAdded != 0) {
qCWarning(dcPythonIntegrations()) << "Failed to add the logger object";
Py_DECREF(logger);
Py_DECREF(m_logger);
m_logger = nullptr;
}
// Export metadata ids into module

3
libnymea-core/integrations/pythonintegrationplugin.h
View File

@ -77,6 +77,9 @@ private:
PyObject *m_nymeaModule = nullptr;
// The imported plugin module (the plugin.py)
PyObject *m_pluginModule = nullptr;
PyObject *m_logger = nullptr;
PyObject *m_stdOutHandler = nullptr;
PyObject *m_stdErrHandler = nullptr;
// A map of plugin instances to plugin python scripts/modules
// Make sure to hold the GIL when accessing this.