+#include <typeinfo>
#include <signal.h>
+#include <msp/debug/demangle.h>
+#include <msp/debug/errorreporter.h>
#include <msp/io/print.h>
#include "application.h"
#include "getopt.h"
Application::Application():
exit_code(0)
-{ }
+{
+ if(app_)
+ throw logic_error("instance already exists");
+}
int Application::run(int argc, char **argv, void *data)
{
- static bool called = false;
- if(called)
- {
- IO::cerr.write("Trying to call Application::run_app twice!\n");
- return 125;
- }
- called = true;
-
if(!starter_)
{
- IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
+ IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
return 126;
}
}
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_;
+ app_ = 0;
return 124;
}