Catch exceptions during restore and report them, rather than aborting

bbackupquery (refs #3)

1 files changed, 27 insertions, 4 deletions

diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index acece91d..08e1422f 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -1908,10 +1908,33 @@ void BackupQueries::CommandRestore(const std::vector<std::string> &args, const b
 #endif
 
 	// Go and restore...
-	switch(BackupClientRestore(mrConnection, dirID, localName.c_str(), 
-		true /* print progress dots */, restoreDeleted, 
-		false /* don't undelete after restore! */, 
-		opts['r'] /* resume? */))
+	int result;
+
+	try
+	{
+		result = BackupClientRestore(mrConnection, dirID, 
+			localName.c_str(), 
+			true /* print progress dots */, restoreDeleted, 
+			false /* don't undelete after restore! */, 
+			opts['r'] /* resume? */);
+	}
+	catch (BoxException &e)
+	{
+		::syslog(LOG_ERR, "Failed to restore: %s", e.what());
+		return;
+	}
+	catch(std::exception &e)
+	{
+		::syslog(LOG_ERR, "Failed to restore: %s", e.what());
+		return;
+	}
+	catch(...)
+	{
+		::syslog(LOG_ERR, "Failed to restore: unknown error");
+		return;
+	}
+
+	switch(result)
 	{
 	case Restore_Complete:
 		printf("Restore complete\n");