Changeset 2604 for box/trunk/lib/common/Logging.h

Timestamp:

10/02/2010 19:01:12 (2 years ago)

Author:

chris

Message:

Log more detailed info about backup comparison failures, for debugging.

Enable -V option in bbackupquery, and document that -q, -v, -V and
-W<level> are allowed in the command-line help.

File:

• box/trunk/lib/common/Logging.h (modified) (3 diffs)

box/trunk/lib/common/Logging.h

@@ -18 +18 @@
 
 #include "FileStream.h"
-
-/*
-#define BOX_LOG(level, stuff) \
-{ \
-    if(Log::sMaxLoggingLevelForAnyOutput >= level) \
-        std::ostringstream line; \
-        line << stuff; \
-        Log::Write(level, __FILE__, __LINE__, line.str()); \
-    } \
-}
-*/
 
 #define BOX_LOG(level, stuff) \
@@ -53 +42 @@
         { BOX_LOG(Log::TRACE, stuff) }
 
+#define BOX_SYS_ERROR(stuff) \
+        stuff << ": " << std::strerror(errno) << " (" << errno << ")"
+
 #define BOX_LOG_SYS_WARNING(stuff) \
-        BOX_WARNING(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_WARNING(BOX_SYS_ERROR(stuff))
 #define BOX_LOG_SYS_ERROR(stuff) \
-        BOX_ERROR(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_ERROR(BOX_SYS_ERROR(stuff))
 #define BOX_LOG_SYS_FATAL(stuff) \
-        BOX_FATAL(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_FATAL(BOX_SYS_ERROR(stuff))
+
+#define LOG_AND_THROW_ERROR(message, filename, exception, subtype) \
+        BOX_LOG_SYS_ERROR(message << ": " << filename); \
+        THROW_EXCEPTION_MESSAGE(exception, subtype, \
+                BOX_SYS_ERROR(message << ": " << filename));
 
 inline std::string GetNativeErrorMessage()
@@ -340 +337 @@
 };
 
+std::string PrintEscapedBinaryData(const std::string& rInput);
+
 #endif // LOGGING__H