import 15.2.2 octopus source

[ceph.git] / ceph / src / mgr / PyModule.cc

diff --git a/ceph/src/mgr/PyModule.cc b/ceph/src/mgr/PyModule.cc
index 016a6cf7df5ec138fe96c772aa676a0b0f4cfaf8..6ebf2b9ad2be02fab2c27cc86f81da7feca4ac77 100644 (file)
--- a/ceph/src/mgr/PyModule.cc
+++ b/ceph/src/mgr/PyModule.cc
@@ -43,6 +43,7 @@ std::string handle_pyerror()
     PyObject *exc, *val, *tb;
     object formatted_list, formatted;
     PyErr_Fetch(&exc, &val, &tb);
+    PyErr_NormalizeException(&exc, &val, &tb);
     handle<> hexc(exc), hval(allow_null(val)), htb(allow_null(tb));
     object traceback(import("traceback"));
     if (!tb) {
@@ -56,6 +57,7 @@ std::string handle_pyerror()
           std::stringstream ss;
           ss << PyUnicode_AsUTF8(name_attr) << ": " << PyUnicode_AsUTF8(val);
           Py_XDECREF(name_attr);
+          ss << "\nError processing exception object: " << peek_pyerror();
           return ss.str();
         }
     } else {
@@ -69,6 +71,7 @@ std::string handle_pyerror()
           std::stringstream ss;
           ss << PyUnicode_AsUTF8(name_attr) << ": " << PyUnicode_AsUTF8(val);
           Py_XDECREF(name_attr);
+          ss << "\nError processing exception object: " << peek_pyerror();
           return ss.str();
         }
     }