Changeset 2158 for box/trunk/bin/bbackupquery/BackupQueries.cpp

Timestamp:

05/05/2008 22:04:33 (4 years ago)

Author:

chris

Message:

Catch server errors when listing a directory.

File:

• box/trunk/bin/bbackupquery/BackupQueries.cpp (modified) (4 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -411 +411 @@
                         BOX_ERROR("Directory '" << args[0] << "' not found "
                                 "on store.");
+                        SetReturnCode(COMMAND_RETURN_ERROR);
                         return;
                 }
@@ -436 +437 @@
 
         // Do communication
-        mrConnection.QueryListDirectory(
-                        DirID,
-                        BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING,    // both files and directories
-                        excludeFlags,
-                        true /* want attributes */);
+        try
+        {
+                mrConnection.QueryListDirectory(
+                                DirID,
+                                BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING,
+                                // both files and directories
+                                excludeFlags,
+                                true /* want attributes */);
+        }
+        catch (std::exception &e)
+        {
+                BOX_ERROR("Failed to list directory: " << e.what());
+                SetReturnCode(COMMAND_RETURN_ERROR);
+                return;
+        }
+        catch (...)
+        {
+                BOX_ERROR("Failed to list directory: unknown error");
+                SetReturnCode(COMMAND_RETURN_ERROR);
+                return;
+        }
+
 
         // Retrieve the directory from the stream following
@@ -756 +774 @@
         {
                 BOX_ERROR("Incorrect usage. cd [-o] [-d] <directory>");
+                SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }
@@ -773 +792 @@
         {
                 BOX_ERROR("Directory '" << args[0] << "' not found.");
+                SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }