Changeset 280 in pacpusframework for trunk/src/PacpusLib

Timestamp:

03/20/14 11:59:05 (10 years ago)

Author:

Marek Kurdej

Message:

Major: DbiteException uses boost::exception.

Location:

trunk/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (1 diff)
• PacpusApplication.cpp (modified) (2 diffs)
• PacpusException.cpp (modified) (1 diff)
• XmlConfigFile.cpp (modified) (2 diffs)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -509 +509 @@
     } catch (po::error& e) {
         LOG_WARN(e.what());
-        throw PacpusException(e.what());
+        BOOST_THROW_EXCEPTION(PacpusException(e.what()));
     }
 

trunk/src/PacpusLib/PacpusApplication.cpp

@@ -89 +89 @@
     try {
         return QApplication::notify(receiver, ev);
-    } catch (PacpusException & e) {
+    } catch (PacpusException& e) {
         (void)e; // unused
-        LOG_ERROR("PacpusException thrown:" << e.what());
-    } catch (boost::exception & e) {
+        LOG_ERROR("PacpusException thrown:" << e.what() << "\n" << boost::diagnostic_information(e));
+    } catch (boost::exception& e) {
         (void)e; // unused
         LOG_ERROR("boost::exception thrown:" << boost::diagnostic_information(e));
-    } catch (std::exception & e) {
+    } catch (std::exception& e) {
         (void)e; // unused
         LOG_ERROR("std::exception thrown:" << e.what());
@@ -125 +125 @@
     std::stringstream errorMessage;
     errorMessage << "received signal number " << signal;
-    throw PacpusException(errorMessage.str());
+    BOOST_THROW_EXCEPTION(PacpusException(errorMessage.str())
+        << errinfo_signal(signal)
+    );
 }

trunk/src/PacpusLib/PacpusException.cpp

@@ -10 +10 @@
 using namespace pacpus;
 
-PacpusException::PacpusException(const std::string & what)
-    : mWhat(what)
+PacpusException::PacpusException(std::string const& what)
+    : std::runtime_error(what)
 {
 }
 
-PacpusException::~PacpusException() throw()
+PacpusException::~PacpusException()
 {
 }
-
-const char * PacpusException::what() const throw()
-{
-    return mWhat.c_str();
-}

trunk/src/PacpusLib/XmlConfigFile.cpp

@@ -8 +8 @@
 
 #include <Pacpus/kernel/Log.h>
+#include <Pacpus/kernel/PacpusException.h>
 
 #include <cassert>
@@ -67 +68 @@
     } else {
         LOG_ERROR("cannot open XML document " << kXmlConfigFilename);
-        throw "cannot open XML document file";
+        BOOST_THROW_EXCEPTION(PacpusException("cannot open XML document file"));
     }
 }