Redesign uncaught exception handling to allow external reporters

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index ebd928b7b7ce049cd2d33ebcedba2ab8f8d4f190..43bb023143679e7fdf5e64d893208f859222d973 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,4 +1,7 @@
+#include <typeinfo>

 #include <signal.h>
 #include <signal.h>

+#include <msp/debug/demangle.h>
+#include <msp/debug/errorreporter.h>

 #include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
 #include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"


@@ -53,9 +56,18 @@ int Application::run(int argc, char **argv, void *data)
        }
        catch(const exception &e)
        {
        }
        catch(const exception &e)
        {

-               delete app_;
+               bool handled = false;
+               if(const Debug::ErrorReporter *er = Debug::ErrorReporter::get_current())
+                       handled = er->report_uncaught_exception(e);

 
 

-               display_exception(e);
+               if(!handled)
+               {
+                       IO::print(IO::cerr, "An uncaught exception occurred.\n");
+                       IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
+                       IO::print(IO::cerr, "  what(): %s\n", e.what());
+               }
+
+               delete app_;

 
                return 124;
        }
 
                return 124;
        }