Changeset 1790 for box/chris/general/bin/bbackupctl/bbackupctl.cpp

Timestamp:

03/08/2007 00:29:31 (5 years ago)

Author:

chris

Message:

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

File:

• box/chris/general/bin/bbackupctl/bbackupctl.cpp (modified) (12 diffs)

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;