Changeset 1784 for box/chris/general/bin/bbstored/BackupStoreDaemon.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/BackupStoreDaemon.cpp (modified) (4 diffs)

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

@@ -209 +209 @@
                                 ::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6);
                                 // Log that housekeeping started
-                                ::syslog(LOG_INFO, "Housekeeping process started");
+                                BOX_INFO("Housekeeping process started");
                                 // Ignore term and hup
                                 // Parent will handle these and alert the child via the socket, don't want to randomly die
@@ -282 +282 @@
         catch(BoxException &e)
         {
-                ::syslog(LOG_ERR, "%s: disconnecting due to "
-                        "exception %s (%d/%d)", DaemonName(), 
-                        e.what(), e.GetType(), e.GetSubType());
+                BOX_ERROR("Error in child process, terminating connection: " <<
+                        e.what() << " (" << e.GetType() << "/" << 
+                        e.GetSubType() << ")");
         }
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "%s: disconnecting due to "
-                        "exception %s", DaemonName(), e.what());
+                BOX_ERROR("Error in child process, terminating connection: " <<
+                        e.what());
         }
         catch(...)
         {
-                ::syslog(LOG_ERR, "%s: disconnecting due to "
-                        "unknown exception", DaemonName());
+                BOX_ERROR("Error in child process, terminating connection: " <<
+                        "unknown exception");
         }
 }
@@ -312 +312 @@
         
         // Log the name
-        ::syslog(LOG_INFO, "Certificate CN: %s", clientCommonName.c_str());
+        BOX_INFO("Client certificate CN: " << clientCommonName);
         
         // Check it
@@ -358 +358 @@
 {
         // Log the amount of data transferred
-        ::syslog(LOG_INFO, "Connection statistics for %s: "
-                        "IN=%lld OUT=%lld TOTAL=%lld", commonName,
-                        (long long)s.GetBytesRead(), 
-                        (long long)s.GetBytesWritten(),
-                        (long long)s.GetBytesRead() + 
-                        (long long)s.GetBytesWritten());
-}
+        BOX_INFO("Connection statistics for " << commonName << ":"
+                " IN="  << s.GetBytesRead() <<
+                " OUT=" << s.GetBytesWritten() <<
+                " TOTAL=" << (s.GetBytesRead() + s.GetBytesWritten()));
+}