[Box Backup-dev] COMMIT r809 - box/chris/merge/bin/bbackupd

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-08-21 00:41:07 +0100 (Mon, 21 Aug 2006)
New Revision: 809

Modified:
   box/chris/merge/bin/bbackupd/BackupDaemon.cpp
Log:
* bin/bbackupd/BackupDaemon.cpp
- Improved exception messages for reading and writing the 
  StoreObjectInfoFile, and made them consistent.


Modified: box/chris/merge/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/merge/bin/bbackupd/BackupDaemon.cpp	2006-08-20 23:23:31 UTC (rev 808)
+++ box/chris/merge/bin/bbackupd/BackupDaemon.cpp	2006-08-20 23:41:07 UTC (rev 809)
@@ -2333,13 +2333,33 @@
 		::syslog(LOG_INFO, "Saved store object info file '%s'", 
 			StoreObjectInfoFile.c_str());
 	}
+	catch(std::exception &e)
+	{
+		::syslog(LOG_ERR, "Internal error writing store object "
+			"info file (%s): %s",
+			StoreObjectInfoFile.c_str(), e.what());
+	}
 	catch(...)
 	{
-		::syslog(LOG_WARNING, "Requested store object info file '%s' "
-			"not accessible or could not be created", 
+		::syslog(LOG_ERR, "Internal error writing store object "
+			"info file (%s): unknown error",
 			StoreObjectInfoFile.c_str());
 	}
 
+	DeleteAllLocations();
+	catch(std::exception &e)
+	{
+		::syslog(LOG_WARNING, "Requested store object info file '%s' "
+			"not accessible or could not be created: %s", 
+			StoreObjectInfoFile.c_str(), e.what());
+	}
+	catch(...)
+	{
+		::syslog(LOG_WARNING, "Requested store object info file '%s' "
+			"not accessible or could not be created: "
+			"unknown error", StoreObjectInfoFile.c_str());
+	}
+
 	return created;
 }
 
@@ -2492,12 +2512,14 @@
 	catch(std::exception &e)
 	{
 		::syslog(LOG_ERR, "Internal error reading store object "
-			"info file: %s", e.what());
+			"info file (%s): %s",
+			StoreObjectInfoFile.c_str(), e.what());
 	}
 	catch(...)
 	{
 		::syslog(LOG_ERR, "Internal error reading store object "
-			"info file: unknown error");
+			"info file (%s): unknown error",
+			StoreObjectInfoFile.c_str());
 	}
 
 	DeleteAllLocations();