Add backtrace to exception message

This patch introduces new method 'message()' in class Exception
which must be overloaded by all dervied classes instead of
'what()' method. This is needed to add backtrace info to
exception message.

Change-Id: Ic451578c72566300283843468a32297fdec42f56

diff --git a/src/common/exceptions/BucketAlreadyExistsException.h b/src/common/exceptions/BucketAlreadyExistsException.h
index 5fbdbe9..9fa7d6f 100644 (file)
--- a/src/common/exceptions/BucketAlreadyExistsException.h
+++ b/src/common/exceptions/BucketAlreadyExistsException.h
@@ -36,6 +36,10 @@ public:
     BucketAlreadyExistsException(const PolicyBucketId &bucketId) : m_bucketId(bucketId) {}
     virtual ~BucketAlreadyExistsException() = default;
 
+    virtual const std::string message(void) const {
+        return "BucketAlreadyExistsException";
+    }
+
 private:
     PolicyBucketId m_bucketId;
 

diff --git a/src/common/exceptions/BucketNotExistsException.h b/src/common/exceptions/BucketNotExistsException.h
index c1668a6..54c942e 100644 (file)
--- a/src/common/exceptions/BucketNotExistsException.h
+++ b/src/common/exceptions/BucketNotExistsException.h
@@ -36,6 +36,10 @@ public:
     BucketNotExistsException(const PolicyBucketId &bucketId) : m_bucketId(bucketId) {}
     virtual ~BucketNotExistsException() = default;
 
+    virtual const std::string message(void) const {
+        return "BucketNotExistsException";
+    }
+
 private:
     PolicyBucketId m_bucketId;
 

diff --git a/src/common/exceptions/BucketRecordCorruptedException.h b/src/common/exceptions/BucketRecordCorruptedException.h
index aaa5e11..227c1d9 100644 (file)
--- a/src/common/exceptions/BucketRecordCorruptedException.h
+++ b/src/common/exceptions/BucketRecordCorruptedException.h
@@ -50,14 +50,14 @@ public:
         return copy;
     }
 
-    virtual const char* what(void) const noexcept {
+    virtual const std::string message(void) const {
         if (m_whatMsg.empty()) {
             m_whatMsg = "Bucket record corrupted at"
                 + formatedFilename()
                 + formatedLineNumber()
                 + ": <" + slicedLine() + ">";
         }
-        return m_whatMsg.c_str();
+        return m_whatMsg;
     }
 
 protected:

diff --git a/src/common/exceptions/DefaultBucketDeletionException.h b/src/common/exceptions/DefaultBucketDeletionException.h
index 18101e7..6a92ec5 100644 (file)
--- a/src/common/exceptions/DefaultBucketDeletionException.h
+++ b/src/common/exceptions/DefaultBucketDeletionException.h
@@ -33,6 +33,10 @@ class DefaultBucketDeletionException : public Exception {
 public:
     DefaultBucketDeletionException() = default;
     virtual ~DefaultBucketDeletionException() = default;
+
+    virtual const std::string message(void) const {
+        return "DefaultBucketDeletionException";
+    }
 };
 
 } /* namespace Cynara */

diff --git a/src/common/exceptions/DescriptorNotExistsException.h b/src/common/exceptions/DescriptorNotExistsException.h
index ab12771..5dd9553 100644 (file)
--- a/src/common/exceptions/DescriptorNotExistsException.h
+++ b/src/common/exceptions/DescriptorNotExistsException.h
@@ -45,8 +45,8 @@ public:
 
     virtual ~DescriptorNotExistsException() = default;
 
-    virtual const char *what(void) const noexcept {
-        return m_whatMsg.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMsg;
     }
 };
 

diff --git a/src/common/exceptions/Exception.h b/src/common/exceptions/Exception.h
index b4d11b5..92546b2 100644 (file)
--- a/src/common/exceptions/Exception.h
+++ b/src/common/exceptions/Exception.h
@@ -23,13 +23,26 @@
 #define SRC_COMMON_EXCEPTIONS_EXCEPTION_H_
 
 #include <exception>
+#include <log/Backtrace.h>
 
 namespace Cynara {
 
 class Exception : public std::exception {
 public:
-    Exception() = default;
+    Exception() {
+        m_backtrace = Backtrace::getBacktrace();
+    }
+
     virtual ~Exception() = default;
+
+    virtual const char *what(void) const noexcept {
+        return (message() + " From: " + m_backtrace).c_str();
+    }
+
+    virtual const std::string message(void) const = 0;
+
+private:
+    std::string m_backtrace;
 };
 
 } /* namespace Cynara */

diff --git a/src/common/exceptions/InitException.h b/src/common/exceptions/InitException.h
index f3f69fa..d06e1d7 100644 (file)
--- a/src/common/exceptions/InitException.h
+++ b/src/common/exceptions/InitException.h
@@ -33,6 +33,10 @@ class InitException : public Exception {
 public:
     InitException() = default;
     virtual ~InitException() = default;
+
+    virtual const std::string message(void) const {
+        return "InitException";
+    }
 };
 
 } /* namespace Cynara */

diff --git a/src/common/exceptions/InvalidProtocolException.h b/src/common/exceptions/InvalidProtocolException.h
index 8b1317b..a2d65d1 100644 (file)
--- a/src/common/exceptions/InvalidProtocolException.h
+++ b/src/common/exceptions/InvalidProtocolException.h
@@ -61,8 +61,8 @@ public:
 
     virtual ~InvalidProtocolException() = default;
 
-    virtual const char *what(void) const noexcept {
-        return m_whatMessage.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMessage;
     }
 
     ExceptionType exceptionTyp(void) const {

diff --git a/src/common/exceptions/NotImplementedException.h b/src/common/exceptions/NotImplementedException.h
index 90fa586..ceabb9a 100644 (file)
--- a/src/common/exceptions/NotImplementedException.h
+++ b/src/common/exceptions/NotImplementedException.h
@@ -33,6 +33,10 @@ class NotImplementedException : public Exception {
 public:
     NotImplementedException() = default;
     virtual ~NotImplementedException() = default;
+
+    virtual const std::string message(void) const {
+        return "NotImplementedException";
+    }
 };
 
 } /* namespace Cynara */

diff --git a/src/common/exceptions/NullPointerException.h b/src/common/exceptions/NullPointerException.h
index 0b5d30e..ffd0bef 100644 (file)
--- a/src/common/exceptions/NullPointerException.h
+++ b/src/common/exceptions/NullPointerException.h
@@ -44,8 +44,8 @@ public:
 
     virtual ~NullPointerException() = default;
 
-    virtual const char* what() const noexcept {
-        return m_whatMsg.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMsg;
     }
 };
 

diff --git a/src/common/exceptions/OutOfDataException.h b/src/common/exceptions/OutOfDataException.h
index e7513b1..827eb7a 100644 (file)
--- a/src/common/exceptions/OutOfDataException.h
+++ b/src/common/exceptions/OutOfDataException.h
@@ -46,8 +46,8 @@ public:
 
     virtual ~OutOfDataException() = default;
 
-    virtual const char* what() const noexcept {
-        return m_whatMsg.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMsg;
     }
 };
 

diff --git a/src/common/exceptions/PluginNotFoundException.h b/src/common/exceptions/PluginNotFoundException.h
index 5cbb155..345fd1d 100644 (file)
--- a/src/common/exceptions/PluginNotFoundException.h
+++ b/src/common/exceptions/PluginNotFoundException.h
@@ -47,8 +47,8 @@ public:
 
     virtual ~PluginNotFoundException() = default;
 
-    virtual const char *what(void) const noexcept {
-        return m_whatMessage.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMessage;
     }
 };
 

diff --git a/src/common/exceptions/ServerConnectionErrorException.h b/src/common/exceptions/ServerConnectionErrorException.h
index ebdf574..a5a7b08 100644 (file)
--- a/src/common/exceptions/ServerConnectionErrorException.h
+++ b/src/common/exceptions/ServerConnectionErrorException.h
@@ -33,7 +33,7 @@ class ServerConnectionErrorException : public Exception {
 public:
     ServerConnectionErrorException() = default;
     virtual ~ServerConnectionErrorException() = default;
-    virtual const char* what() const noexcept {
+    virtual const std::string message(void) const {
         return "ServerConnectionError";
     }
 };

diff --git a/src/common/exceptions/UnexpectedErrorException.h b/src/common/exceptions/UnexpectedErrorException.h
index 0b85ad4..a7d100b 100644 (file)
--- a/src/common/exceptions/UnexpectedErrorException.h
+++ b/src/common/exceptions/UnexpectedErrorException.h
@@ -51,8 +51,8 @@ public:
 
     virtual ~UnexpectedErrorException() = default;
 
-    virtual const char* what() const noexcept {
-        return m_whatMessage.c_str();
+    virtual const std::string message(void) const {
+        return m_whatMessage;
     }
 };
 

diff --git a/test/common/exceptions/bucketrecordcorrupted.cpp b/test/common/exceptions/bucketrecordcorrupted.cpp
index ddc6039..f940442 100644 (file)
--- a/test/common/exceptions/bucketrecordcorrupted.cpp
+++ b/test/common/exceptions/bucketrecordcorrupted.cpp
@@ -29,48 +29,63 @@
 using namespace Cynara;
 
 TEST(BucketRecordCorruptedException, line) {
+    using ::testing::StartsWith;
+
     BucketRecordCorruptedException ex("line");
     auto expected = "Bucket record corrupted at line: <line>";
-    ASSERT_STREQ(expected, ex.what());
+
+    ASSERT_THAT(ex.what(), StartsWith(expected));
     ASSERT_EQ("line", ex.line());
     ASSERT_EQ("", ex.filename());
     ASSERT_EQ(0, ex.lineNumber());
 }
 
 TEST(BucketRecordCorruptedException, line_lineno) {
+    using ::testing::StartsWith;
+
     auto ex = BucketRecordCorruptedException("line").withLineNumber(10);
     auto expected = "Bucket record corrupted at line 10: <line>";
-    ASSERT_STREQ(expected, ex.what());
+
+    ASSERT_THAT(ex.what(), StartsWith(expected));
     ASSERT_EQ("line", ex.line());
     ASSERT_EQ("", ex.filename());
     ASSERT_EQ(10, ex.lineNumber());
 }
 
 TEST(BucketRecordCorruptedException, line_lineno_filename) {
+    using ::testing::StartsWith;
+
     auto ex = BucketRecordCorruptedException("line").withLineNumber(10).withFilename("bucket.bkt");
     auto expected = "Bucket record corrupted at bucket.bkt:10: <line>";
-    ASSERT_STREQ(expected, ex.what());
+
+    ASSERT_THAT(ex.what(), StartsWith(expected));
     ASSERT_EQ("line", ex.line());
     ASSERT_EQ("bucket.bkt", ex.filename());
     ASSERT_EQ(10, ex.lineNumber());
 }
 
 TEST(BucketRecordCorruptedException, line_filename) {
+    using ::testing::StartsWith;
+
     auto ex = BucketRecordCorruptedException("line").withFilename("bucket.bkt");
     auto expected = "Bucket record corrupted at bucket.bkt: <line>";
-    ASSERT_STREQ(expected, ex.what());
+
+    ASSERT_THAT(ex.what(), StartsWith(expected));
     ASSERT_EQ("line", ex.line());
     ASSERT_EQ("bucket.bkt", ex.filename());
     ASSERT_EQ(0, ex.lineNumber());
 }
 
 TEST(BucketRecordCorruptedException, line_sliced) {
+    using ::testing::StartsWith;
+
     std::string line = "A very long line placed here just to check,"
                        " if slicing works as expected (83 chars)";
     auto ex = BucketRecordCorruptedException(line);
     auto expected = "Bucket record corrupted at line:"
             " <A very long line placed here just to check, if sli...>";
-    ASSERT_STREQ(expected, ex.what());
+
+    ASSERT_THAT(ex.what(), StartsWith(expected));
     ASSERT_EQ(line, ex.line());
     ASSERT_EQ("", ex.filename());
     ASSERT_EQ(0, ex.lineNumber());