sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Don't append full traceback when a QgsProcessingException is

Browse Source 
raised by a Python algorithm

This is too noisy for these expected exceptions -- instead, only
show the traceback for other exceptions (Which are likely a result
of Python coding errors, so they are useful for debugging)
This commit is contained in:
Nyall Dawson 2019-05-31 09:58:00 +10:00
parent e45b62c6af
commit c2ce430116
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
python/core/core.sip.in
View File

@ -107,8 +107,40 @@ done:
%Include core_auto.sip
%VirtualErrorHandler processing_exception_handler
QString trace = getTraceback();
QgsLogger::critical( trace );
// if an explicit QgsProcessingException was raised, we don't retrieve
// and append the trace. It's too noisy for these "expected" type errors.
// For all other exceptions, it's likely a coding error in the algorithm,
// so we DO retrieve the full traceback for debugging.
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
PyTypeObject* err = reinterpret_cast< PyTypeObject* >( PyErr_Occurred() );
const bool isProcessingException = err && QString( err->tp_name ) == QStringLiteral( "QgsProcessingException" );
QString what;
if ( isProcessingException )
{
PyObject *type, *value, *traceback;
PyErr_Fetch( &type, &value, &traceback );
// check whether the object is already a unicode string
if ( PyUnicode_Check( value) )
{
what = QString::fromUtf8( PyUnicode_AsUTF8( value ) );
}
else
{
PyObject* str = PyObject_Str( value );
what = QString::fromUtf8( PyUnicode_AsUTF8( str ) );
Py_XDECREF( str );
}
PyGILState_Release( gstate );
}
else
{
PyGILState_Release( gstate );
QString trace = getTraceback();
QgsLogger::critical( trace );
what = trace;
}
SIP_RELEASE_GIL( sipGILState );
throw QgsProcessingException( trace );
throw QgsProcessingException( what );
%End