Changeset 2184 for box/trunk/bin/bbackupquery/bbackupquery.cpp

Timestamp:

28/05/2008 16:35:42 (4 years ago)

Author:

chris

Message:

Add bbackupquery -W<level> option to set explicit warning level,

Obsolete old (inconsistent) meaning of -q in bbackupquery.

Replace -q with -Wwarning or -Werror in tests to reduce noise and fix
tests.

Test that reading a nonexistent directory on the server doesn't crash
server or client.

Test that bbackupd does continue backup run and delete files when
storage limit is exceeded.

Use logging guards to hide expected warnings in testbbackupd.

Remove apparently pointless listing files on server at the end of
testbbackupd.

File:

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

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -108 +108 @@
         
         // Flags
-        bool quiet = false;
         bool readWrite = false;
 
@@ -120 +119 @@
 
 #ifdef WIN32
-        const char* validOpts = "qvwuc:l:";
+        const char* validOpts = "qvwuc:l:W:";
         bool unicodeConsole = false;
 #else
-        const char* validOpts = "qvwc:l:";
+        const char* validOpts = "qvwc:l:W:";
 #endif
 
@@ -134 +133 @@
                         case 'q':
                         {
-                                // Quiet mode
-                                quiet = true;
-
                                 if(masterLevel == Log::NOTHING)
                                 {
@@ -161 +157 @@
                         break;
 
+                case 'W':
+                        {
+                                masterLevel = Logging::GetNamedLevel(optarg);
+                                if (masterLevel == Log::INVALID)
+                                {
+                                        BOX_FATAL("Invalid logging level");
+                                        return 2;
+                                }
+                        }
+                        break;
+
                 case 'w':
                         // Read/write mode
@@ -198 +205 @@
         Logging::SetGlobalLevel((Log::Level)masterLevel);
 
+        bool quiet = false;
+        if (masterLevel < Log::NOTICE)
+        {
+                // Quiet mode
+                quiet = true;
+        }
+
         // Print banner?
         if(!quiet)