Changeset 1745

Timestamp:

26/07/2007 22:40:45 (18 months ago)

Author:

chris

Message:

Add more debugging checks and messages for location setup error
reported by Pete Jalajas
(http://lists.warhead.org.uk/pipermail/boxbackup/2007-July/003668.html)
(refs #3, merges [1728])

Location:

box/chris/general

Files:

• bin/bbackupd/BackupDaemon.cpp (modified) (3 diffs)
• lib/win32/emu.cpp (modified) (2 diffs)

box/chris/general/bin/bbackupd/BackupDaemon.cpp

@@ -1697 +1697 @@
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 {
-                                        THROW_EXCEPTION(CommonException, OSFileError)
+                                        BOX_WARNING("Failed to stat location: "
+                                                << ploc->mPath 
+                                                << ": " << strerror(errno));
+                                        THROW_EXCEPTION(CommonException,
+                                                OSFileError)
                                 }
 
@@ -1782 +1786 @@
                                 
                                 // Execute create directory command
-                                MemBlockStream attrStream(attr);
-                                std::auto_ptr<BackupProtocolClientSuccess> dirCreate(connection.QueryCreateDirectory(
-                                        BackupProtocolClientListDirectory::RootDirectory,
-                                        attrModTime, dirname, attrStream));
-                                        
-                                // Object ID for later creation
-                                oid = dirCreate->GetObjectID();
+                                try
+                                {
+                                        MemBlockStream attrStream(attr);
+                                        std::auto_ptr<BackupProtocolClientSuccess> dirCreate(connection.QueryCreateDirectory(
+                                                BackupProtocolClientListDirectory::RootDirectory,
+                                                attrModTime, dirname, attrStream));
+                                                
+                                        // Object ID for later creation
+                                        oid = dirCreate->GetObjectID();
+                                }
+                                catch (BoxException &e)
+                                {
+                                        BOX_ERROR("Failed to create remote "
+                                                "directory '/" << dirname <<
+                                                "', skipping location.");
+                                        continue;
+                                }
+
                         }
 
@@ -1798 +1813 @@
                         // Push it back on the vector of locations
                         mLocations.push_back(ploc);
+                }
+                catch (std::exception &e)
+                {
+                        delete ploc;
+                        ploc = 0;
+                        BOX_ERROR("Failed to setup location '"
+                                << ploc->mName << "' path '"
+                                << ploc->mPath << "': " << e.what());
+                        throw;
                 }
                 catch(...)

box/chris/general/lib/win32/emu.cpp

@@ -429 +429 @@
         if (pWide == NULL)
         {
+                ::syslog(LOG_ERR, "Failed to convert string '%s' from "
+                        "current code page %d to wide string: %s",
+                        rSource.c_str(), sourceCodePage,
+                        GetErrorMessage(GetLastError()).c_str());
                 return false;
         }
@@ -437 +441 @@
         if (!pConsole)
         {
+                // Error should have been logged by ConvertFromWideString
                 return false;
         }