Changeset 2884

Timestamp:

27/03/2011 02:02:19 (14 months ago)

Author:

chris

Message:

Fix abort if the local data directory doesn't exist.

Location:

box/trunk/bin/bbackupd

Files:

• BackupDaemon.cpp (modified) (4 diffs)
• bbackupd.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -574 +574 @@
 void BackupDaemon::RunSyncNowWithExceptionHandling()
 {
-        OnBackupStart();
-
-        // Do sync
         bool errorOccurred = false;
         int errorCode = 0, errorSubCode = 0;
@@ -583 +580 @@
         try
         {
+                OnBackupStart();
+                // Do sync
                 RunSyncNow();
         }
@@ -976 +975 @@
 void BackupDaemon::OnBackupFinish()
 {
-        // Log
-        BOX_NOTICE("Finished scan of local files");
-
-        // Log the stats
-        BOX_NOTICE("File statistics: total file size uploaded "
-                << BackupStoreFile::msStats.mBytesInEncodedFiles
-                << ", bytes already on server "
-                << BackupStoreFile::msStats.mBytesAlreadyOnServer
-                << ", encoded size "
-                << BackupStoreFile::msStats.mTotalFileStreamSize);
-
-        // Reset statistics again
-        BackupStoreFile::ResetStats();
-
-        // Notify administrator
-        NotifySysadmin(SysadminNotifier::BackupFinish);
-
-        // Tell anything connected to the command socket
-        SendSyncStartOrFinish(false /* finish */);
-
-        // Touch a file to record times in filesystem
-        TouchFileInWorkingDir("last_sync_finish");
+        try
+        {
+                // Log
+                BOX_NOTICE("Finished scan of local files");
+
+                // Log the stats
+                BOX_NOTICE("File statistics: total file size uploaded "
+                        << BackupStoreFile::msStats.mBytesInEncodedFiles
+                        << ", bytes already on server "
+                        << BackupStoreFile::msStats.mBytesAlreadyOnServer
+                        << ", encoded size "
+                        << BackupStoreFile::msStats.mTotalFileStreamSize);
+
+                // Reset statistics again
+                BackupStoreFile::ResetStats();
+
+                // Notify administrator
+                NotifySysadmin(SysadminNotifier::BackupFinish);
+
+                // Tell anything connected to the command socket
+                SendSyncStartOrFinish(false /* finish */);
+
+                // Touch a file to record times in filesystem
+                TouchFileInWorkingDir("last_sync_finish");
+        }
+        catch (std::exception &e)
+        {
+                BOX_ERROR("Failed to perform backup finish actions: " << e.what());
+        }
 }
 
@@ -2089 +2095 @@
         
         // Open and close it to update the timestamp
-        FileStream touch(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+        try
+        {
+                FileStream touch(fn, O_WRONLY | O_CREAT | O_TRUNC,
+                        S_IRUSR | S_IWUSR);
+        }
+        catch (std::exception &e)
+        {
+                BOX_ERROR("Failed to write to timestamp file: " << fn << ": " <<
+                        e.what());
+        }
 }
 

box/trunk/bin/bbackupd/bbackupd.cpp

@@ -42 +42 @@
                 BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE,
                 argc, argv);
-        delete gpDaemonService;
+        delete gpDaemonService;
 
 #else // !WIN32