upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

nicer python error log errors.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4970 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-11-22 13:47:37 +00:00
parent d21cb609a8
commit 438634b718
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pythonmod/pythonmod.c
View file

@ -115,6 +115,7 @@ static void
log_py_err(void) log_py_err(void)
{ {
char *result = NULL; char *result = NULL;
const char* iomod = "cStringIO";
PyObject *modStringIO = NULL; PyObject *modStringIO = NULL;
PyObject *modTB = NULL; PyObject *modTB = NULL;
PyObject *obFuncStringIO = NULL; PyObject *obFuncStringIO = NULL;
@ -133,10 +134,16 @@ log_py_err(void)
/* Import the modules we need - cStringIO and traceback */ /* Import the modules we need - cStringIO and traceback */
modStringIO = PyImport_ImportModule("cStringIO"); modStringIO = PyImport_ImportModule("cStringIO");
if (modStringIO==NULL) /* python 1.4 and before */ if (modStringIO==NULL) {
/* python 1.4 and before */
modStringIO = PyImport_ImportModule("StringIO"); modStringIO = PyImport_ImportModule("StringIO");
if (modStringIO==NULL) /* python 3 */ iomod = "StringIO";
}
if (modStringIO==NULL) {
/* python 3 */
modStringIO = PyImport_ImportModule("io"); modStringIO = PyImport_ImportModule("io");
iomod = "io";
}
if (modStringIO==NULL) { if (modStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot ImportModule cStringIO or StringIO or io"); "cannot ImportModule cStringIO or StringIO or io");
@ -153,13 +160,13 @@ log_py_err(void)
obFuncStringIO = PyObject_GetAttrString(modStringIO, "StringIO"); obFuncStringIO = PyObject_GetAttrString(modStringIO, "StringIO");
if (obFuncStringIO==NULL) { if (obFuncStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot GetAttrString cStringIO.StringIO"); "cannot GetAttrString %s.StringIO", iomod);
goto cleanup; goto cleanup;
} }
obStringIO = PyObject_CallObject(obFuncStringIO, NULL); obStringIO = PyObject_CallObject(obFuncStringIO, NULL);
if (obStringIO==NULL) { if (obStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot call cStringIO.StringIO()"); "cannot call %s.StringIO()", iomod);
goto cleanup; goto cleanup;
} }
@ -192,21 +199,21 @@ log_py_err(void)
obFuncStringIO = PyObject_GetAttrString(obStringIO, "getvalue"); obFuncStringIO = PyObject_GetAttrString(obStringIO, "getvalue");
if (obFuncStringIO==NULL) { if (obFuncStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot GetAttrString cStringIO.getvalue"); "cannot GetAttrString StringIO.getvalue");
goto cleanup; goto cleanup;
} }
Py_DECREF(obResult); Py_DECREF(obResult);
obResult = PyObject_CallObject(obFuncStringIO, NULL); obResult = PyObject_CallObject(obFuncStringIO, NULL);
if (obResult==NULL) { if (obResult==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"call cStringIO.getvalue() failed"); "call StringIO.getvalue() failed");
goto cleanup; goto cleanup;
} }
/* And it should be a string all ready to go - duplicate it. */ /* And it should be a string all ready to go - duplicate it. */
if (!PyString_Check(obResult) && !PyUnicode_Check(obResult)) { if (!PyString_Check(obResult) && !PyUnicode_Check(obResult)) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cStringIO.getvalue() result did not String_Check" "StringIO.getvalue() result did not String_Check"
" or Unicode_Check"); " or Unicode_Check");
goto cleanup; goto cleanup;
} }