Changeset 289 in pacpusframework

Timestamp:

Mar 26, 2014, 9:27:40 PM (11 years ago)

Author:

Marek Kurdej

Message:

Minor: more diagnostic information on exceptions in DbitePlayer and PacpusSensor.

Location:

trunk/src

Files:

• DBITEPlayer/src/main.cpp (modified) (4 diffs)
• PacpusLib/PacpusApplication.cpp (modified) (1 diff)
• PacpusSensor/src/main.cpp (modified) (2 diffs)

trunk/src/DBITEPlayer/src/main.cpp

@@ -43 +43 @@
 #include <boost/assert.hpp>
 #include <boost/cstdlib.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 
 using namespace pacpus;
@@ -56 +57 @@
 
     PacpusApplication app(argc, argv);
-    ComponentManager * mgr = ComponentManager::getInstance();
+    ComponentManager* mgr = ComponentManager::getInstance();
 
     static ComponentFactory<DbtPlyEngine> factoryDbtPlyEngine("DbtPlyEngine");
@@ -79 +80 @@
     }
 
-    int exitStatus;
+    int exitStatus = boost::exit_exception_failure;
     try {
         // start all the components (engine, trigger, user interface and the DBT file managers)
@@ -87 +88 @@
         // stop all components before exiting app
         mgr->stop();
-
         mgr->destroy();
     } catch (PacpusException& e) {
-        LOG_WARN("Pacpus exception caught: " << e.what());
-        exitStatus = boost::exit_exception_failure;
+        LOG_FATAL("PacpusException caught:" << e.what() << "\n" << boost::diagnostic_information(e));
+    } catch (boost::exception& e) {
+        (void)e; // unused
+        LOG_FATAL("boost::exception caught:" << boost::diagnostic_information(e));
+    } catch (std::exception& e) {
+        (void)e; // unused
+        LOG_FATAL("std::exception caught:" << e.what());
     }
 

trunk/src/PacpusLib/PacpusApplication.cpp

@@ -91 +91 @@
     } catch (PacpusException& e) {
         (void)e; // unused
-        LOG_ERROR("PacpusException thrown:" << e.what() << "\n" << boost::diagnostic_information(e));
+        LOG_ERROR("PacpusException caught:" << e.what() << "\n" << boost::diagnostic_information(e));
     } catch (boost::exception& e) {
         (void)e; // unused
-        LOG_ERROR("boost::exception thrown:" << boost::diagnostic_information(e));
+        LOG_ERROR("boost::exception caught:" << boost::diagnostic_information(e));
     } catch (std::exception& e) {
         (void)e; // unused
-        LOG_ERROR("std::exception thrown:" << e.what());
+        LOG_ERROR("std::exception caught:" << e.what());
     }
     return false;

trunk/src/PacpusSensor/src/main.cpp

@@ -6 +6 @@
 /// @version    $Id: main.cpp 81 2013-01-11 22:31:02Z kurdejma $
 
-#include <QApplication>
-
 #include "ui/pacpusmainwindow.h"
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/PacpusApplication.h>
+#include <Pacpus/kernel/PacpusException.h>
+
+#include <boost/cstdlib.hpp>
+#include <boost/exception/diagnostic_information.hpp>
+#include <QApplication>
 #include <QThread>
 #ifdef WIN32
@@ -62 +65 @@
     window.show();
     LOG_INFO("Current Thread " << QThread::currentThread());
-    // save application exit status
-    int exitStatus = app.exec();
-    // stop all components before exiting app
-    mgr->stop();
-
-    mgr->destroy();
+    
+    int exitStatus = boost::exit_exception_failure;
+    try {
+        // save application exit status
+        exitStatus = app.exec();
+        // stop all components before exiting app
+        mgr->stop();
+        mgr->destroy();
+    } catch (PacpusException& e) {
+        LOG_FATAL("PacpusException caught:" << e.what() << "\n" << boost::diagnostic_information(e));
+    } catch (boost::exception& e) {
+        (void)e; // unused
+        LOG_FATAL("boost::exception caught:" << boost::diagnostic_information(e));
+    } catch (std::exception& e) {
+        (void)e; // unused
+        LOG_FATAL("std::exception caught:" << e.what());
+    }
 
 #ifdef WIN32