Changeset 1790

Timestamp:

03/08/2007 00:29:31 (17 months ago)

Author:

chris

Message:

Convert most printf() and fprintf() calls to use logging framework
instead. (merges [1789])

Location:

box/chris/general

Files:

• bin/bbackupctl/bbackupctl.cpp (modified) (12 diffs)
• bin/bbackupquery/BackupQueries.cpp (modified) (54 diffs)
• bin/bbackupquery/bbackupquery.cpp (modified) (8 diffs)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (20 diffs)
• lib/backupclient/BackupClientRestore.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreCheck.cpp (modified) (23 diffs)
• lib/backupstore/BackupStoreCheck2.cpp (modified) (9 diffs)
• lib/common/DebugMemLeakFinder.cpp (modified) (1 diff)
• lib/common/Logging.cpp (modified) (2 diffs)
• lib/crypto/Random.cpp (modified) (1 diff)
• lib/raidfile/RaidFileController.cpp (modified) (1 diff)
• lib/server/SSLLib.cpp (modified) (1 diff)
• test/bbackupd/testfiles/extcheck1.pl.in (modified) (1 diff)
• test/bbackupd/testfiles/extcheck2.pl.in (modified) (1 diff)

box/chris/general/bin/bbackupctl/bbackupctl.cpp

@@ -110 +110 @@
 
         // Read in the configuration file
-        if(!quiet) printf("Using configuration file %s\n", 
-                configFilename.c_str());
+        if(!quiet) BOX_NOTICE("Using configuration file " << configFilename);
 
         std::string errs;
@@ -120 +119 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_ERROR("Invalid configuration file: " << errs);
                 return 1;
         }
@@ -129 +128 @@
         if(!conf.KeyExists("CommandSocket"))
         {
-                printf("Daemon isn't using a control socket, "
+                BOX_ERROR("Daemon isn't using a control socket, "
                         "could not execute command.\n"
                         "Add a CommandSocket declaration to the "
-                        "bbackupd.conf file.\n");
+                        "bbackupd.conf file.");
                 return 1;
         }
@@ -154 +153 @@
         catch(...)
         {
-                printf("Failed to connect to daemon control socket.\n"
+                BOX_ERROR("Failed to connect to daemon control socket.\n"
                         "Possible causes:\n"
                         "  * Daemon not running\n"
                         "  * Daemon busy syncing with store server\n"
                         "  * Another bbackupctl process is communicating with the daemon\n"
-                        "  * Daemon is waiting to recover from an error\n"
+                        "  * Daemon is waiting to recover from an error"
                 );
-
-#if defined WIN32 && ! defined NDEBUG
-                BOX_ERROR("Failed to connect to the command socket");
-#endif
 
                 return 1;
@@ -194 +189 @@
                         &updateStoreInterval, &minimumFileAge, &maxUploadWait) != 4)
         {
-                printf("Config summary didn't decode\n");
+                BOX_ERROR("Config summary didn't decode.");
                 return 1;
         }
@@ -200 +195 @@
         if(!quiet)
         {
-                printf("Daemon configuration summary:\n"
-                        "  AutomaticBackup = %s\n"
-                        "  UpdateStoreInterval = %d seconds\n"
-                        "  MinimumFileAge = %d seconds\n"
-                        "  MaxUploadWait = %d seconds\n",
-                        autoBackup?"true":"false", updateStoreInterval, 
-                        minimumFileAge, maxUploadWait);
+                BOX_INFO("Daemon configuration summary:\n"
+                        "  AutomaticBackup = " << 
+                        (autoBackup?"true":"false") << "\n"
+                        "  UpdateStoreInterval = " << updateStoreInterval << 
+                        " seconds\n"
+                        "  MinimumFileAge = " << minimumFileAge << " seconds\n"
+                        "  MaxUploadWait = " << maxUploadWait << " seconds\n");
         }
 
@@ -267 +262 @@
                         if (currentState != 0)
                         {
-                                printf("Waiting for current sync/error state "
-                                        "to finish...\n");
+                                BOX_INFO("Waiting for current sync/error state "
+                                        "to finish...");
                         }
                 }
@@ -311 +306 @@
                                 if(line == "start-sync")
                                 {
-                                        if (!quiet) printf("Sync started...\n");
+                                        if (!quiet) BOX_INFO("Sync started...");
                                         syncIsRunning = true;
                                 }
@@ -318 +313 @@
                                         if (syncIsRunning)
                                         {
-                                                if (!quiet) printf("Sync finished.\n");
+                                                if (!quiet) BOX_INFO("Sync finished.\n");
                                                 // Send a quit command to finish nicely
                                                 connection.Write("quit\n", 5);
@@ -327 +322 @@
                                         else
                                         {
-                                                if (!quiet) printf("Previous sync finished.\n");
+                                                if (!quiet) BOX_INFO("Previous sync finished.");
                                         }
                                         // daemon must still be busy
@@ -341 +336 @@
                                         if(!quiet)
                                         {
-                                                printf("Succeeded.\n");
+                                                BOX_INFO("Succeeded.\n");
                                         }
                                         finished = true;
@@ -347 +342 @@
                                 else if(line == "error")
                                 {
-                                        printf("ERROR. (Check command spelling)\n");
+                                        BOX_ERROR("Check command spelling");
                                         returnCode = 1;
                                         finished = true;

box/chris/general/bin/bbackupquery/BackupQueries.cpp

@@ -182 +182 @@
                                 GetConsoleCP()))
                         {
-                                printf("Failed to convert encoding");
+                                BOX_ERROR("Failed to convert encoding");
                                 return;
                         }
@@ -256 +256 @@
                 if(alias[a] == 0)
                 {
-                        printf("Unrecognised command: %s\n", Command);
+                        BOX_ERROR("Unrecognised command: " << Command);
                         return;
                 }
@@ -276 +276 @@
                         if(::strchr(commands[cmd].opts, *c) == NULL)
                         {
-                                printf("Invalid option '%c' for command %s\n", 
-                                        *c, commands[cmd].name);
+                                BOX_ERROR("Invalid option '" << *c << "' for "
+                                        "command " << commands[cmd].name);
                                 return;
                         }
@@ -306 +306 @@
                 {
                         // Simple implementation, so do it here
-                        printf("%s (%08llx)\n", 
-                                GetCurrentDirectoryName().c_str(), 
-                                (long long)GetCurrentDirectoryID());
+                        BOX_INFO(GetCurrentDirectoryName() << " (" <<
+                                BOX_FORMAT_OBJECTID(GetCurrentDirectoryID()));
                 }
                 break;
@@ -321 +320 @@
                 
         case COMMAND_sh:
-                printf("The command to run must be specified as an argument.\n");
+                BOX_ERROR("The command to run must be specified as an argument.");
                 break;
                 
@@ -402 +401 @@
                 if(rootDir == 0)
                 {
-                        printf("Directory '%s' not found on store\n",
-                                args[0].c_str());
+                        BOX_ERROR("Directory '" << args[0] << "' not found "
+                                "on store.");
                         return;
                 }
@@ -748 +747 @@
         if(args.size() != 1 || args[0].size() == 0)
         {
-                printf("Incorrect usage.\ncd [-o] [-d] <directory>\n");
+                BOX_ERROR("Incorrect usage. cd [-o] [-d] <directory>");
                 return;
         }
@@ -765 +764 @@
         if(id == 0)
         {
-                printf("Directory '%s' not found\n", args[0].c_str());
+                BOX_ERROR("Directory '" << args[0] << "' not found.");
                 return;
         }
@@ -786 +785 @@
         if(args.size() != 1 || args[0].size() == 0)
         {
-                printf("Incorrect usage.\nlcd <local-directory>\n");
+                BOX_ERROR("Incorrect usage. lcd <local-directory>");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -796 +795 @@
         if(!ConvertConsoleToUtf8(args[0].c_str(), dirName))
         {
-                printf("Failed to convert path from console encoding.\n");
+                BOX_ERROR("Failed to convert path from console encoding.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -806 +805 @@
         if(result != 0)
         {
-                printf((errno == ENOENT || errno == ENOTDIR)?"Directory '%s' does not exist\n":"Error changing dir to '%s'\n",
-                        args[0].c_str());
+                if(errno == ENOENT || errno == ENOTDIR)
+                {
+                        BOX_ERROR("Directory '" << args[0] << "' does not exist.");
+                }
+                else
+                {
+                        BOX_ERROR("Error changing to directory '" <<
+                                args[0] << ": " << strerror(errno));
+                }
+
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -816 +823 @@
         if(::getcwd(wd, PATH_MAX) == 0)
         {
-                printf("Error getting current directory\n");
+                BOX_ERROR("Error getting current directory: " <<
+                        strerror(errno));
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -824 +832 @@
         if(!ConvertUtf8ToConsole(wd, dirName))
         {
-                printf("Failed to convert new path from console encoding.\n");
+                BOX_ERROR("Failed to convert new path from console encoding.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }
-        printf("Local current directory is now '%s'\n", dirName.c_str());
+        BOX_INFO("Local current directory is now '" << dirName << "'.");
 #else
-        printf("Local current directory is now '%s'\n", wd);
+        BOX_INFO("Local current directory is now '" << wd << "'.");
 #endif
 }
@@ -848 +856 @@
         if(args.size() != 2)
         {
-                printf("Incorrect usage.\ngetobject <object-id> <local-filename>\n");
+                BOX_ERROR("Incorrect usage. getobject <object-id> "
+                        "<local-filename>");
                 return;
         }
@@ -855 +864 @@
         if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0)
         {
-                printf("Not a valid object ID (specified in hex)\n");
+                BOX_ERROR("Not a valid object ID (specified in hex).");
                 return;
         }
@@ -863 +872 @@
         if(::stat(args[1].c_str(), &st) == 0 || errno != ENOENT)
         {
-                printf("The local file %s already exists\n", args[1].c_str());
+                BOX_ERROR("The local file '" << args[1] << " already exists.");
                 return;
         }
@@ -881 +890 @@
                         objectStream->CopyStreamTo(out);
                         
-                        printf("Object ID %08llx fetched successfully.\n", id);
+                        BOX_INFO("Object ID " << BOX_FORMAT_OBJECTID(id) <<
+                                " fetched successfully.");
                 }
                 else
                 {
-                        printf("Object does not exist on store.\n");
+                        BOX_ERROR("Object ID " << BOX_FORMAT_OBJECTID(id) <<
+                                " does not exist on store.");
                         ::unlink(args[1].c_str());
                 }
@@ -892 +903 @@
         {
                 ::unlink(args[1].c_str());
-                printf("Error occured fetching object.\n");
+                BOX_ERROR("Error occured fetching object.");
         }
 }
@@ -912 +923 @@
         if(args.size() < 1 || (opts['i'] && args.size() != 2) || args.size() > 2)
         {
-                printf("Incorrect usage.\n"
+                BOX_ERROR("Incorrect usage.\n"
                         "get <remote-filename> [<local-filename>] or\n"
-                        "get -i <object-id> <local-filename>\n");
+                        "get -i <object-id> <local-filename>");
                 return;
         }
@@ -932 +943 @@
                         if(!ConvertConsoleToUtf8(i->c_str(), out))
                         {
-                                fprintf(stderr, "failed to convert encoding\n");
+                                BOX_ERROR("Failed to convert encoding.");
                                 return;
                         }
@@ -953 +964 @@
                                 if(dirId == 0)
                                 {
-                                        printf("Directory '%s' not found\n", 
-                                                dirName.c_str());
+                                        BOX_ERROR("Directory '" << dirName <<
+                                                "' not found.");
                                         return;
                                 }
@@ -982 +993 @@
                                 fileId == 0)
                         {
-                                printf("Not a valid object ID (specified in hex)\n");
+                                BOX_ERROR("Not a valid object ID (specified in hex).");
                                 return;
                         }
@@ -989 +1000 @@
                         if(dir.FindEntryByID(fileId) == 0)
                         {
-                                printf("ID '%08llx' not found in current "
+                                BOX_ERROR("File ID " << 
+                                        BOX_FORMAT_OBJECTID(fileId) <<
+                                        " not found in current "
                                         "directory on store.\n"
-                                        "(You can only download objects by ID "
-                                        "from the current directory.)\n", 
-                                        fileId);
+                                        "(You can only download files by ID "
+                                        "from the current directory.)");
                                 return;
                         }
@@ -1008 +1020 @@
                         if(en == 0)
                         {
-                                printf("Filename '%s' not found in current "
+                                BOX_ERROR("Filename '" << args[0] << "' "
+                                        "not found in current "
                                         "directory on store.\n"
                                         "(Subdirectories in path not "
-                                        "searched.)\n", args[0].c_str());
+                                        "searched.)");
                                 return;
                         }
@@ -1028 +1041 @@
         if(::stat(localName.c_str(), &st) == 0 || errno != ENOENT)
         {
-                printf("The local file %s already exists, will not "
-                        "overwrite it.\n", localName.c_str());
+                BOX_ERROR("The local file " << localName << " already exists, "
+                        "will not overwrite it.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -1047 +1060 @@
 
                 // Done.
-                printf("Object ID %08llx fetched sucessfully.\n", fileId);
+                BOX_INFO("Object ID " << BOX_FORMAT_OBJECTID(fileId) <<
+                        " fetched successfully.");
         }
         catch (BoxException &e)
@@ -1161 +1175 @@
                 else
                 {
-                        printf("Warning: couldn't determine the time of the last synchronisation -- checks not performed.\n");
+                        BOX_WARNING("Failed to determine the time of the last "
+                                "synchronisation -- checks not performed.");
                 }
         }
@@ -1168 +1183 @@
         if(params.mQuickCompare)
         {
-                printf("WARNING: Quick compare used -- file attributes are not checked.\n");
+                BOX_WARNING("Quick compare used -- file attributes are not "
+                        "checked.");
         }
         
@@ -1193 +1209 @@
                 if(!params.mIgnoreExcludes)
                 {
-                        printf("Cannot use excludes on directory to directory comparison -- use -E flag to specify ignored excludes\n");
+                        BOX_ERROR("Cannot use excludes on directory to directory comparison -- use -E flag to specify ignored excludes.");
                         return;
                 }
@@ -1204 +1220 @@
         else
         {
-                printf("Incorrect usage.\ncompare -a\n or compare -l <location-name>\n or compare <store-dir-name> <local-dir-name>\n");
+                BOX_ERROR("Incorrect usage.\ncompare -a\n or compare -l <location-name>\n or compare <store-dir-name> <local-dir-name>");
                 return;
         }
@@ -1210 +1226 @@
         if (!params.mQuietCompare)
         {       
-                printf("\n[ %d (of %d) differences probably due to file "
-                        "modifications after the last upload ]\n",
-                        params.mDifferencesExplainedByModTime, 
-                        params.mDifferences);
-        }
-
-        printf("Differences: %d (%d dirs excluded, %d files excluded, "
-                "%d files not checked)\n",
-                params.mDifferences, params.mExcludedDirs, 
-                params.mExcludedFiles, params.mUncheckedFiles);
+                BOX_INFO("[ " <<
+                        params.mDifferencesExplainedByModTime << " (of " <<
+                        params.mDifferences << ") differences probably "
+                        "due to file modifications after the last upload ]");
+        }
+
+        BOX_INFO("Differences: " << params.mDifferences << " (" <<
+                params.mExcludedDirs   << " dirs excluded, " <<
+                params.mExcludedFiles  << " files excluded, " <<
+                params.mUncheckedFiles << " files not checked)");
         
         // Set return code?
@@ -1254 +1270 @@
         if(!locations.SubConfigurationExists(rLocation.c_str()))
         {
-                printf("Location %s does not exist.\n", rLocation.c_str());
+                BOX_ERROR("Location " << rLocation << " does not exist.");
                 return;
         }
@@ -1265 +1281 @@
                         DIRECTORY_SEPARATOR_ASCHAR)
                 {
-                        fprintf(stderr, "Warning: location '%s' path ends "
-                                "with '%s', compare may fail!",
-                                rLocation.c_str(), DIRECTORY_SEPARATOR);
+                        BOX_WARNING("Location '" << rLocation << "' path ends "
+                                "with '" DIRECTORY_SEPARATOR "', "
+                                "compare may fail!");
                 }
         }
@@ -1320 +1336 @@
         if(dirID == 0)
         {
-                printf("Local directory '%s' exists, but "
-                        "server directory '%s' does not exist\n", 
-                        rLocalDir.c_str(), rStoreDir.c_str());          
+                BOX_WARNING("Local directory '" << rLocalDir << "' exists, "
+                        "but server directory '" << rStoreDir << "' does not "
+                        "exist.");
                 rParams.mDifferences ++;
                 return;
@@ -1370 +1386 @@
                 if(errno == ENOTDIR)
                 {
-                        printf("Local object '%s' is a file, "
-                                "server object '%s' is a directory\n", 
-                                localDirDisplay.c_str(), 
-