Changeset 1784

Timestamp:

01/08/2007 00:18:50 (18 months ago)

Author:

chris

Message:

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

Location:

box/chris/general

Files:

• bin/bbackupctl/bbackupctl.cpp (modified) (6 diffs)
• bin/bbackupd/BackupClientContext.cpp (modified) (5 diffs)
• bin/bbackupd/Win32ServiceFunctions.cpp (modified) (14 diffs)
• bin/bbackupquery/BackupQueries.cpp (modified) (1 diff)
• bin/bbstored/BBStoreDHousekeeping.cpp (modified) (6 diffs)
• bin/bbstored/BackupCommands.cpp (modified) (6 diffs)
• bin/bbstored/BackupStoreDaemon.cpp (modified) (4 diffs)
• bin/bbstored/HousekeepStoreAccount.cpp (modified) (4 diffs)
• lib/backupclient/BackupClientFileAttributes.cpp (modified) (3 diffs)
• lib/backupclient/BackupClientRestore.cpp (modified) (13 diffs)
• lib/backupclient/BackupStoreFile.cpp (modified) (2 diffs)
• lib/common/BoxTime.cpp (modified) (2 diffs)
• lib/common/DebugPrintf.cpp (modified) (1 diff)
• lib/common/Logging.h (modified) (2 diffs)
• lib/raidfile/RaidFileRead.cpp (modified) (8 diffs)
• lib/server/Daemon.cpp (modified) (2 diffs)
• lib/server/LocalProcessStream.cpp (modified) (2 diffs)
• lib/server/SSLLib.cpp (modified) (2 diffs)
• lib/server/ServerStream.h (modified) (5 diffs)
• lib/server/Socket.cpp (modified) (3 diffs)
• lib/server/WinNamedPipeStream.cpp (modified) (16 diffs)

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

@@ -163 +163 @@
 
 #if defined WIN32 && ! defined NDEBUG
-                syslog(LOG_ERR,"Failed to connect to the command socket");
+                BOX_ERROR("Failed to connect to the command socket");
 #endif
 
@@ -176 +176 @@
         if(!getLine.GetLine(configSummary))
         {
-#if defined WIN32 && ! defined NDEBUG
-                syslog(LOG_ERR, "Failed to receive configuration summary "
+                BOX_ERROR("Failed to receive configuration summary "
                         "from daemon");
-#else
-                printf("Failed to receive configuration summary from daemon\n");
-#endif
-
                 return 1;
         }
@@ -189 +184 @@
         if(getLine.IsEOF())
         {
-#if defined WIN32 && ! defined NDEBUG
-                syslog(LOG_ERR, "Server rejected the connection. "
-                        "Are you running bbackupctl as the same user "
-                        "as the daemon?");
-#else
-                printf("Server rejected the connection. "
-                        "Are you running bbackupctl as the same user "
-                        "as the daemon?\n");
-#endif
-
+                BOX_ERROR("Server rejected the connection. Are you running "
+                        "bbackupctl as the same user as the daemon?");
                 return 1;
         }
@@ -225 +212 @@
         if(!getLine.GetLine(stateLine) || getLine.IsEOF())
         {
-#if defined WIN32 && ! defined NDEBUG
-                syslog(LOG_ERR, "Failed to receive state line from daemon");
-#else
-                printf("Failed to receive state line from daemon\n");
-#endif
+                BOX_ERROR("Failed to receive state line from daemon");
                 return 1;
         }
@@ -237 +220 @@
         if(::sscanf(stateLine.c_str(), "state %d", &currentState) != 1)
         {
-                printf("State line didn't decode\n");
+                BOX_ERROR("Received invalid state line from daemon");
                 return 1;
         }
@@ -267 +250 @@
                         if(!autoBackup)
                         {
-                                printf("ERROR: Daemon is not in automatic mode -- "
-                                        "sync will never start!\n");
+                                BOX_ERROR("Daemon is not in automatic mode, "
+                                        "sync will never start!");
                                 return 1;
                         }

box/chris/general/bin/bbackupd/BackupClientContext.cpp

@@ -10 +10 @@
 #include "Box.h"
 
-#ifdef HAVE_SYSLOG_H
-        #include <syslog.h>
-#endif
 #ifdef HAVE_SIGNAL_H
         #include <signal.h>
 #endif
+
 #ifdef HAVE_SYS_TIME_H
         #include <sys/time.h>
@@ -128 +126 @@
                 
                 // Log intention
-                ::syslog(LOG_INFO, "Opening connection to server %s...", mHostname.c_str());
+                BOX_INFO("Opening connection to server '" <<
+                        mHostname << "'...");
 
                 // Connect!
@@ -148 +147 @@
                         if (!mpExtendedLogFileHandle)
                         {
-                                ::syslog(LOG_ERR, "Failed to open extended "
-                                        "log file: %s", strerror(errno));
+                                BOX_ERROR("Failed to open extended log "
+                                        "file: " << strerror(errno));
                         }
                         else
@@ -195 +194 @@
                 
                 // Log success
-                ::syslog(LOG_INFO, "Connection made, login successful");
+                BOX_INFO("Connection made, login successful");
 
                 // Check to see if there is any space available on the server
@@ -203 +202 @@
                         mStorageLimitExceeded = true;
                         // Log
-                        ::syslog(LOG_WARNING, "Exceeded storage hard-limit on server -- not uploading changes to files");
+                        BOX_WARNING("Exceeded storage hard-limit on server, "
+                                "not uploading changes to files");
                 }
         }

box/chris/general/bin/bbackupd/Win32ServiceFunctions.cpp

@@ -45 +45 @@
         memset(buf, 0, sizeof(buf));
         _snprintf(buf, sizeof(buf)-1, "%s (%d)", s, err);
-        ::syslog(LOG_ERR, "%s", buf);
+        BOX_ERROR(buf);
         MessageBox(0, buf, "Error", 
                 MB_OK | MB_SETFOREGROUND | MB_DEFAULT_DESKTOP_ONLY);
@@ -192 +192 @@
                 if (emu_stat(pConfigFileName, &st) != 0)
                 {
-                        syslog(LOG_ERR, "Failed to open configuration file: "
-                                "%s: %s", pConfigFileName, strerror(errno));
+                        BOX_ERROR("Failed to open configuration file '" <<
+                                pConfigFileName << "': " << strerror(errno));
                         return 1;
                 }
@@ -200 +200 @@
                 {
         
-                        syslog(LOG_ERR, "Failed to open configuration file: "
-                                "%s: not a file", pConfigFileName);
+                        BOX_ERROR("Failed to open configuration file '" <<
+                                pConfigFileName << "': not a file");
                         return 1;
                 }
@@ -210 +210 @@
         if (!scm) 
         {
-                syslog(LOG_ERR, "Failed to open service control manager: "
-                        "error %d", GetLastError());
+                BOX_ERROR("Failed to open service control manager: " <<
+                        GetErrorMessage(GetLastError()));
                 return 1;
         }
@@ -249 +249 @@
                         case ERROR_SERVICE_EXISTS:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
+                                BOX_ERROR("Failed to create Box Backup "
                                         "service: it already exists");
                         }
@@ -256 +256 @@
                         case ERROR_SERVICE_MARKED_FOR_DELETE:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
+                                BOX_ERROR("Failed to create Box Backup "
                                         "service: it is waiting to be deleted");
                         }
@@ -263 +263 @@
                         case ERROR_DUPLICATE_SERVICE_NAME:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
+                                BOX_ERROR("Failed to create Box Backup "
                                         "service: a service with this name "
                                         "already exists");
@@ -271 +271 @@
                         default:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
-                                        "service: error %d", err);
+                                BOX_ERROR("Failed to create Box Backup "
+                                        "service: error " <<
+                                        GetErrorMessage(GetLastError()));
                         }
                 }
@@ -279 +280 @@
         }
 
-        ::syslog(LOG_INFO, "Created Box Backup service");
+        BOX_INFO("Created Box Backup service");
         
         SERVICE_DESCRIPTION desc;
@@ -287 +288 @@
                 &desc))
         {
-                ::syslog(LOG_WARNING, "Failed to set description for "
-                        "Box Backup service: error %d", GetLastError());
+                BOX_WARNING("Failed to set description for Box Backup "
+                        "service: " << GetErrorMessage(GetLastError()));
         }
 
@@ -302 +303 @@
         if (!scm) 
         {
-                syslog(LOG_ERR, "Failed to open service control manager: "
-                        "error %d", GetLastError());
+                BOX_ERROR("Failed to open service control manager: " <<
+                        GetErrorMessage(GetLastError()));
                 return 1;
         }
@@ -318 +319 @@
                         // hello microsoft? anyone home?
                 {
-                        syslog(LOG_ERR, "Failed to open Box Backup service: "
+                        BOX_ERROR("Failed to open Box Backup service: "
                                 "not installed or not found");
                 }
                 else
                 {
-                        syslog(LOG_ERR, "Failed to open Box Backup service: "
-                                "error %d", err);
+                        BOX_ERROR("Failed to open Box Backup service: " <<
+                                GetErrorMessage(err));
                 }
                 return 1;
@@ -335 +336 @@
                 if (err != ERROR_SERVICE_NOT_ACTIVE)
                 {
-                        syslog(LOG_WARNING, "Failed to stop Box Backup "
-                                "service: error %d", err);
+                        BOX_WARNING("Failed to stop Box Backup service: " <<
+                                GetErrorMessage(err));
                 }
         }
@@ -346 +347 @@
         if (deleted)
         {
-                syslog(LOG_INFO, "Box Backup service deleted");
+                BOX_INFO("Box Backup service deleted");
                 return 0;
         }
         else if (err == ERROR_SERVICE_MARKED_FOR_DELETE)
         {
-                syslog(LOG_ERR, "Failed to remove Box Backup service: "
+                BOX_ERROR("Failed to remove Box Backup service: "
                         "it is already being deleted");
         }
         else
         {
-                syslog(LOG_ERR, "Failed to remove Box Backup service: "
-                        "error %d", err);
+                BOX_ERROR("Failed to remove Box Backup service: " <<
+                        GetErrorMessage(err));
         }
 

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

@@ -2010 +2010 @@
                         opts['r'] /* resume? */);
         }
-        catch (BoxException &e)
-        {
-                ::syslog(LOG_ERR, "Failed to restore: %s", e.what());
-                return;
-        }
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Failed to restore: %s", e.what());
+                BOX_ERROR("Failed to restore: " << e.what());
                 return;
         }
         catch(...)
         {
-                ::syslog(LOG_ERR, "Failed to restore: unknown error");
+                BOX_ERROR("Failed to restore: unknown exception");
                 return;
         }

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;
                         }

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

@@ -9 +9 @@
 
 #include "Box.h"
-
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
 
 #include <set>
@@ -89 +85 @@
         // Check given client ID against the ID in the certificate certificate
         // and that the client actually has an account on this machine
-        if(mClientID != rContext.GetClientID() || !rContext.GetClientHasAccount())
-        {
-                ::syslog(LOG_INFO, "Failed login: Client ID presented was %08X", mClientID);
-                return std::auto_ptr<ProtocolObject>(new BackupProtocolServerError(
-                        BackupProtocolServerError::ErrorType, BackupProtocolServerError::Err_BadLogin));
+        if(mClientID != rContext.GetClientID())
+        {
+                BOX_WARNING("Failed login from client ID " << 
+                        BOX_FORMAT_ACCOUNT(mClientID) <<
+                        ": wrong certificate for this account");
+                return std::auto_ptr<ProtocolObject>(
+                        new BackupProtocolServerError(
+                                BackupProtocolServerError::ErrorType,
+                                BackupProtocolServerError::Err_BadLogin));
+        }
+
+        if(!rContext.GetClientHasAccount())
+        {
+                BOX_WARNING("Failed login from client ID " << 
+                        BOX_FORMAT_ACCOUNT(mClientID) <<
+                        ": no such account on this server");
+                return std::auto_ptr<ProtocolObject>(
+                        new BackupProtocolServerError(
+                                BackupProtocolServerError::ErrorType,
+                                BackupProtocolServerError::Err_BadLogin));
         }
 
@@ -102 +113 @@
                 if(!rContext.AttemptToGetWriteLock())
                 {
-                        ::syslog(LOG_INFO, "Failed to get write lock (for Client ID %08X)", mClientID);
-                        return std::auto_ptr<ProtocolObject>(new BackupProtocolServerError(
-                                BackupProtocolServerError::ErrorType, BackupProtocolServerError::Err_CannotLockStoreForWriting));                       
+                        BOX_WARNING("Failed to get write lock for Client ID " <<
+                                BOX_FORMAT_ACCOUNT(mClientID));
+                        return std::auto_ptr<ProtocolObject>(
+                                new BackupProtocolServerError(
+                                        BackupProtocolServerError::ErrorType,
+                                        BackupProtocolServerError::Err_CannotLockStoreForWriting));                     
                 }
                 
@@ -121 +135 @@
         
         // Log login
-        ::syslog(LOG_INFO, "Login: Client ID %08X, %s", mClientID, ((mFlags & Flags_ReadOnly) != Flags_ReadOnly)?"Read/Write":"Read-only");
+        BOX_NOTICE("Login from Client ID " << 
+                BOX_FORMAT_ACCOUNT(mClientID) <<
+                " " <<
+                (((mFlags & Flags_ReadOnly) != Flags_ReadOnly)
+                ?"Read/Write":"Read-only"));
 
         // Get the usage info for reporting to the client
@@ -141 +159 @@
 std::auto_ptr<ProtocolObject> BackupProtocolServerFinished::DoCommand(BackupProtocolServer &rProtocol, BackupContext &rContext)
 {
-        ::syslog(LOG_INFO, "Session finished");
+        BOX_NOTICE("Session finished for Client ID " << 
+                BOX_FORMAT_ACCOUNT(rContext.GetClientID()));
 
         // Let the context know about it
@@ -312 +331 @@
                         if(en == 0)
                         {
-                                ::syslog(LOG_ERR, "Object %llx in dir %llx for account %x references object %llx which does not exist in dir",
-                                        mObjectID, mInDirectory, rContext.GetClientID(), id);
-                                return std::auto_ptr<ProtocolObject>(new BackupProtocolServerError(
-                                        BackupProtocolServerError::ErrorType, BackupProtocolServerError::Err_PatchConsistencyError));                   
+                                BOX_ERROR("Object " << 
+                                        BOX_FORMAT_OBJECTID(mObjectID) <<
+                                        " in dir " << 
+                                        BOX_FORMAT_OBJECTID(mInDirectory) <<
+                                        " for account " <<
+                                        BOX_FORMAT_ACCOUNT(rContext.GetClientID()) <<
+                                        " references object " << 
+                                        BOX_FORMAT_OBJECTID(id) <<
+                                        " which does not exist in dir");
+                                return std::auto_ptr<ProtocolObject>(
+                                        new BackupProtocolServerError(
+                                                BackupProtocolServerError::ErrorType,
+                                                BackupProtocolServerError::Err_PatchConsistencyError));                 
                         }
                         id = en->GetDependsNewer();
-                } while(en != 0 && id != 0);
+                }
+                while(en != 0 && id != 0);
                 
                 // OK! The last entry in the chain is the full file, the others are patches back from it.

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());
+    &n