Changeset 2896 for box/trunk/lib/raidfile

Timestamp:

27/03/2011 21:30:43 (14 months ago)

Author:

chris

Message:

Improve RaidFile? error logging.

File:

• box/trunk/lib/raidfile/RaidFileWrite.cpp (modified) (5 diffs)

box/trunk/lib/raidfile/RaidFileWrite.cpp

@@ -134 +134 @@
                 if(existance != RaidFileUtil::NoFile)
                 {
-                        BOX_ERROR("Attempted to overwrite raidfile " <<
-                                mSetNumber << " " << mFilename);
-                        THROW_EXCEPTION(RaidFileException, CannotOverwriteExistingFile)
+                        THROW_FILE_ERROR("Attempted to overwrite raidfile " <<
+                                mSetNumber, mFilename, RaidFileException,
+                                CannotOverwriteExistingFile);
                 }
         }
@@ -151 +151 @@
         if(mOSFileHandle == -1)
         {
-                BOX_LOG_SYS_ERROR("Failed to open file: " << writeFilename);
-                THROW_EXCEPTION(RaidFileException, ErrorOpeningWriteFile)
+                THROW_SYS_FILE_ERROR("Failed to open RaidFile", writeFilename,
+                        RaidFileException, ErrorOpeningWriteFile);
         }
         
@@ -318 +318 @@
 #ifdef WIN32
         // need to delete the target first
-        if(::unlink(renameTo.c_str()) != 0 && 
-                GetLastError() != ERROR_FILE_NOT_FOUND)
-        {
-                BOX_LOG_WIN_ERROR("Failed to delete file: " << renameTo);
-                THROW_EXCEPTION(RaidFileException, OSError)
+        if(::unlink(renameTo.c_str()) != 0)
+        {
+                DWORD errorNumber = GetLastError();
+                if (errorNumber != ERROR_FILE_NOT_FOUND)
+                {
+                        THROW_WIN_FILE_ERRNO("Failed to delete file", renameTo,
+                                errorNumber, RaidFileException, OSError);
+                }
         }
 #endif
@@ -328 +331 @@
         if(::rename(renameFrom.c_str(), renameTo.c_str()) != 0)
         {
-                BOX_LOG_SYS_ERROR("Failed to rename file: " << renameFrom <<
-                        " to " << renameTo);
-                THROW_EXCEPTION(RaidFileException, OSError)
+                THROW_SYS_ERROR("Failed to rename file: " << renameFrom <<
+                        " to " << renameTo, RaidFileException, OSError);
         }
         
@@ -810 +812 @@
                         {
                                 // No. Bad things.
-                                THROW_EXCEPTION(RaidFileException, FileExistsInDirectoryCreation)
+                                THROW_FILE_ERROR("Failed to create RaidFile directory",
+                                        dn, RaidFileException, FileExistsInDirectoryCreation);
                         }
                         else
                         {
-                                THROW_EXCEPTION(RaidFileException, OSError)
+                                THROW_FILE_ERROR("Failed to create RaidFile directory",
+                                        dn, RaidFileException, OSError);
                         }
                 }