Changeset 1790 for box/chris/general/bin/bbstoreaccounts/bbstoreaccounts.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/bbstoreaccounts/bbstoreaccounts.cpp (modified) (20 diffs)

box/chris/general/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -38 +38 @@
         if(SoftLimit >= HardLimit)
         {
-                printf("ERROR: Soft limit must be less than the hard limit.\n");
+                BOX_FATAL("Soft limit must be less than the hard limit.");
                 exit(1);
         }
         if(SoftLimit > ((HardLimit * MAX_SOFT_LIMIT_SIZE) / 100))
         {
-                printf("ERROR: Soft limit must be no more than %d%% of the hard limit.\n", MAX_SOFT_LIMIT_SIZE);
+                BOX_FATAL("Soft limit must be no more than " << 
+                        MAX_SOFT_LIMIT_SIZE << "% of the hard limit.");
                 exit(1);
         }
@@ -54 +55 @@
         if(DiscSet < 0 || DiscSet >= controller.GetNumDiscSets())
         {
-                printf("Disc set %d does not exist\n", DiscSet);
+                BOX_FATAL("Disc set " << DiscSet << " does not exist.");
                 exit(1);
         }
@@ -90 +91 @@
         if(endptr == string || number == LONG_MIN || number == LONG_MAX)
         {
-                printf("%s is an invalid number\n", string);
+                BOX_FATAL("'" << string << "' is not a valid number.");
                 exit(1);
         }
@@ -117 +118 @@
         
         default:
-                printf("%s has an invalid units specifier\nUse B for blocks, M for Mb, G for Gb, eg 2Gb\n", string);
+                BOX_FATAL(string << " has an invalid units specifier "
+                        "(use B for blocks, M for Mb, G for Gb, eg 2Gb)");
                 exit(1);
                 break;          
@@ -144 +146 @@
         {
                 // Couldn't lock the account -- just stop now
-                printf("Couldn't lock the account -- did not change the limits\nTry again later.\n");
+                BOX_ERROR("Failed to lock the account, did not change limits. "
+                        "Try again later.");
                 return 1;
         }
@@ -169 +172 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -199 +203 @@
         info->Save();
 
-        printf("Limits on account 0x%08x changed to %lld soft, %lld hard\n", ID, softlimit, hardlimit);
+        BOX_NOTICE("Limits on account " << BOX_FORMAT_ACCOUNT(ID) <<
+                " changed to " << softlimit << " soft, " <<
+                hardlimit << " hard.");
 
         return 0;
@@ -212 +218 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -242 +249 @@
         if(AskForConfirmation)
         {
-                ::printf("Really delete account %08x?\n(type 'yes' to confirm)\n", ID);
+                BOX_WARNING("Really delete account " << 
+                        BOX_FORMAT_ACCOUNT(ID) << "? (type 'yes' to confirm)");
                 char response[256];
                 if(::fgets(response, sizeof(response), stdin) == 0 || ::strcmp(response, "yes\n") != 0)
                 {
-                        printf("Deletion cancelled\n");
+                        BOX_NOTICE("Deletion cancelled.");
                         return 0;
                 }
@@ -257 +265 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -319 +328 @@
                 }
         }
-        
+
+        int retcode = 0;
+
         // Thirdly, delete the directories...
         for(std::vector<std::string>::const_iterator d(toDelete.begin()); d != toDelete.end(); ++d)
         {
-                ::printf("Deleting store directory %s...\n", (*d).c_str());
+                BOX_NOTICE("Deleting store directory " << (*d) << "...");
                 // Just use the rm command to delete the files
                 std::string cmd("rm -rf ");
@@ -330 +341 @@
                 if(::system(cmd.c_str()) != 0)
                 {
-                        ::printf("ERROR: Deletion of %s failed.\n(when cleaning up, remember to delete all raid directories)\n", (*d).c_str());
-                        return 1;
+                        BOX_ERROR("Failed to delete files in " << (*d) <<
+                                ", delete them manually.");
+                        retcode = 1;
                 }
         }
         
         // Success!
-        return 0;
+        return retcode;
 }
 
@@ -347 +359 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -382 +395 @@
         if(db->EntryExists(ID))
         {
-                printf("Account %x already exists\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " already exists.");
                 return 1;
         }
@@ -390 +404 @@
         acc.Create(ID, DiscNumber, SoftLimit, HardLimit, rUsername);
         
-        printf("Account %x created\n", ID);
+        BOX_NOTICE("Account " << BOX_FORMAT_ACCOUNT(ID) << " created.");
 
         return 0;
@@ -445 +459 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_ERROR("Invalid configuration file " << configFilename <<
+                        ":" << errs);
         }
         
@@ -485 +500 @@
                         || ::sscanf(argv[2], "%d", &discnum) != 1)
                 {
-                        printf("create requires raid file disc number, soft and hard limits\n");
+                        BOX_ERROR("create requires raid file disc number, "
+                                "soft and hard limits.");
                         return 1;
                 }
@@ -507 +523 @@
                 if(argc < 4)
                 {
-                        printf("setlimit requires soft and hard limits\n");
+                        BOX_ERROR("setlimit requires soft and hard limits.");
                         return 1;
                 }
@@ -541 +557 @@
                         else
                         {
-                                ::printf("Unknown option %s.\n", argv[o]);
+                                BOX_ERROR("Unknown option " << argv[o] << ".");
                                 return 2;
                         }
@@ -551 +567 @@
         else
         {
-                printf("Unknown command '%s'\n", argv[0]);
+                BOX_ERROR("Unknown command '" << argv[0] << "'.");
                 return 1;
         }