Changeset 3018

Timestamp:

09/10/2011 23:52:00 (8 months ago)

Author:

chris

Message:

Log fatal exceptions in main helper using BOX_FATAL instead of printf, to
ensure they get logged in all the right places.

File:

• box/trunk/lib/common/MainHelper.h (modified) (2 diffs)

box/trunk/lib/common/MainHelper.h

@@ -14 +14 @@
 
 #include "BoxException.h"
+#include "Logging.h"
 
 #define MAINHELPER_START                                                                        \
@@ -22 +23 @@
         try {
 #define MAINHELPER_END                                                                                                                          \
-        } catch(BoxException &e) {                                                                                                              \
-        printf("Exception: %s (%d/%d)\n", e.what(), e.GetType(), e.GetSubType());               \
-        return 1;                                                                                                                                               \
         } catch(std::exception &e) {                                                                                                    \
-        printf("Exception: %s\n", e.what());                                                                                    \
-        return 1;                                                                                                                                               \
+                BOX_FATAL(e.what()); \
+                return 1;                                                                                                                                               \
         } catch(...) {                                                                                                                                  \
-        printf("Exception: <UNKNOWN>\n");                                                                                               \
-        return 1; }
+                BOX_FATAL("UNKNOWN"); \
+                return 1; \
+        }
 
 #ifdef BOX_MEMORY_LEAK_TESTING