Changeset 1784 for box/chris/general/bin/bbstored/BBStoreDHousekeeping.cpp

Timestamp:

01/08/2007 00:18:50 (5 years ago)

Author:

chris

Message:

Replace almost all calls to syslog() with logging framework. (merges [1783])

File:

• box/chris/general/bin/bbstored/BBStoreDHousekeeping.cpp (modified) (6 diffs)

box/chris/general/bin/bbstored/BBStoreDHousekeeping.cpp

@@ -11 +11 @@
 
 #include <stdio.h>
-
-#ifdef HAVE_SYSLOG_H
-        #include <syslog.h>
-#endif
 
 #include "BackupStoreDaemon.h"
@@ -83 +79 @@
         // Store the time
         mLastHousekeepingRun = timeNow;
-        ::syslog(LOG_INFO, "Starting housekeeping");
+        BOX_INFO("Starting housekeeping");
 
         // Get the list of accounts
@@ -113 +109 @@
                 catch(BoxException &e)
                 {
-                        ::syslog(LOG_ERR, "while housekeeping account %08X, exception %s (%d/%d) -- aborting housekeeping run for this account",
-                                *i, e.what(), e.GetType(), e.GetSubType());
+                        BOX_ERROR("Housekeeping on account " <<
+                                BOX_FORMAT_ACCOUNT(*i) << " threw exception, "
+                                "aborting run for this account: " <<
+                                e.what() << " (" <<
+                                e.GetType() << "/" << e.GetSubType() << ")");
                 }
                 catch(std::exception &e)
                 {
-                        ::syslog(LOG_ERR, "while housekeeping account %08X, exception %s -- aborting housekeeping run for this account",
-                                *i, e.what());
+                        BOX_ERROR("Housekeeping on account " <<
+                                BOX_FORMAT_ACCOUNT(*i) << " threw exception, "
+                                "aborting run for this account: " <<
+                                e.what());
                 }
                 catch(...)
                 {
-                        ::syslog(LOG_ERR, "while housekeeping account %08X, unknown exception -- aborting housekeeping run for this account",
-                                *i);
+                        BOX_ERROR("Housekeeping on account " <<
+                                BOX_FORMAT_ACCOUNT(*i) << " threw exception, "
+                                "aborting run for this account: "
+                                "unknown exception");
                 }
         
@@ -145 +148 @@
         }
                 
-        ::syslog(LOG_INFO, "Finished housekeeping");
+        BOX_INFO("Finished housekeeping");
 
         // Placed here for accuracy, if StopRun() is true, for example.
@@ -191 +194 @@
         if(mInterProcessComms.GetLine(line, false /* no pre-processing */, MaximumWaitTime))
         {
-                TRACE1("housekeeping received command '%s' over interprocess comms\n", line.c_str());
+                TRACE1("Housekeeping received command '%s' over interprocess comms\n", line.c_str());
         
                 int account = 0;
@@ -213 +216 @@
                         {
                                 // Yes! -- need to stop now so when it retries to get the lock, it will succeed
-                                ::syslog(LOG_INFO, "Housekeeping giving way to connection for account 0x%08x", AccountNum);
+                                BOX_INFO("Housekeeping on account " <<
+                                        BOX_FORMAT_ACCOUNT(AccountNum) <<
+                                        "giving way to client connection");
                                 return true;
                         }