Changeset 2115 for box/trunk/bin/bbackupd/BackupDaemon.cpp

Timestamp:

28/03/2008 22:18:44 (4 years ago)

Author:

chris

Message:

Improve logging with macros that consistently output strerror(errno) and
errno, replacing almost all use of strerror() in the main code.

Log a more detailed error message before throwing an exception for some
more system call failures.

Make FileStream? store its filename on all platforms, not just Windows.

Wrap some long lines at less than 80 characters to improve readability.

Fix some minor violations of coding standard (white space) and a typo
in a comment.

File:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (4 diffs)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -1813 +1813 @@
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 {
-                                        BOX_WARNING("Failed to stat location "
+                                        BOX_LOG_SYS_WARNING("Failed to stat location "
                                                 "path '" << apLoc->mPath <<
-                                                "' (" << strerror(errno) <<
-                                                "), skipping location '" <<
+                                                "', skipping location '" <<
                                                 apLoc->mName << "'");
                                         continue;
@@ -2190 +2189 @@
                 if(::rename(newmap.c_str(), target.c_str()) != 0)
                 {
-                        BOX_ERROR("failed to rename ID map: " << newmap
-                                << " to " << target << ": " 
-                                << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to rename ID map: " <<
+                                newmap << " to " << target);
                         THROW_EXCEPTION(CommonException, OSFileError)
                 }
@@ -3056 +3054 @@
         if(!FileExists(storeObjectInfoFile.c_str()))
         {
-                // File doesn't exist -- so can't be deleted. But something isn't quite right, so log a message
-                BOX_WARNING("Store object info file did not exist when it "
-                        "was supposed to. (" << storeObjectInfoFile << ")");
+                // File doesn't exist -- so can't be deleted. But something
+                // isn't quite right, so log a message
+                BOX_WARNING("StoreObjectInfoFile did not exist when it "
+                        "was supposed to: " << storeObjectInfoFile);
 
                 // Return true to stop things going around in a loop
@@ -3067 +3066 @@
         if(::unlink(storeObjectInfoFile.c_str()) != 0)
         {
-                BOX_ERROR("Failed to delete the old store object info file: "
-                        << storeObjectInfoFile << ": "<< strerror(errno));
+                BOX_LOG_SYS_ERROR("Failed to delete the old "
+                        "StoreObjectInfoFile: " << storeObjectInfoFile);
                 return false;
         }