Changeset 1226 for box/chris/merge/bin/bbackupd/BackupDaemon.cpp

Timestamp:

16/12/2006 20:27:44 (5 years ago)

Author:

chris

Message:

Change all logging to use the logging framework, as an example. (refs #3)

File:

• box/chris/merge/bin/bbackupd/BackupDaemon.cpp (modified) (59 diffs)

box/chris/merge/bin/bbackupd/BackupDaemon.cpp

@@ -18 +18 @@
 #ifdef HAVE_SIGNAL_H
         #include <signal.h>
-#endif
-#ifdef HAVE_SYSLOG_H
-        #include <syslog.h>
 #endif
 #ifdef HAVE_SYS_PARAM_H
@@ -77 +74 @@
 #include "Archive.h"
 #include "Timer.h"
+#include "Logging.h"
 
 #include "MemLeakFindOn.h"
@@ -225 +223 @@
         if(GetConfiguration().KeyExists("CommandSocket"))
         {
-                printf(
+                BOX_WARNING(
                                 "==============================================================================\n"
                                 "SECURITY WARNING: This platform cannot check the credentials of connections to\n"
@@ -279 +277 @@
                 catch (BoxException &e)
                 {
-                        ::syslog(LOG_ERR, "Failed to open command socket: %s",
+                        BOX_ERROR("Failed to open command socket" << 
                                 e.what());
                         SetTerminateWanted();
                         break; // this is fatal to listening thread
                 }
-                catch (...)
-                {
-                        ::syslog(LOG_ERR, "Failed to open command socket: "
+                catch(std::exception &e)
+                {
+                        BOX_ERROR("Failed to open command socket" <<
+                                e.what());
+                        SetTerminateWanted();
+                        break; // this is fatal to listening thread
+                }
+                catch(...)
+                {
+                        BOX_ERROR("Failed to open command socket: "
                                 "unknown error");
                         SetTerminateWanted();
                         break; // this is fatal to listening thread
                 }
-                }
-                catch(std::exception &e)
-                {
-                        ::syslog(LOG_ERR, "Failed to open command socket: "
-                                "%s", e.what());
-                        SetTerminateWanted();
-                        break; // this is fatal to listening thread
-                }
-                catch(...)
-                {
-                        ::syslog(LOG_ERR, "Failed to open command socket: "
-                                "unknown error");
-                        SetTerminateWanted();
-                        break; // this is fatal to listening thread
-                }
 
                 try
@@ -314 +304 @@
                         // This next section comes from Ben's original function
                         // Log
-                        ::syslog(LOG_INFO, "Connection from command socket");
+                        BOX_INFO("Connection from command socket");
 
                         // Send a header line summarising the configuration 
@@ -338 +328 @@
                                 !IsTerminateWanted())
                         {
-                                TRACE1("Received command '%s' over "
-                                        "command socket\n", command.c_str());
+                                BOX_TRACE("Received command '" << command 
+                                        << "' over command socket");
 
                                 bool sendOK = false;
@@ -380 +370 @@
                                 else
                                 {
-                                        ::syslog(LOG_ERR, "Received unknown command '%s' from client", command.c_str());
+                                        BOX_ERROR("Received unknown command "
+                                                "'" << command << "' "
+                                                "from client");
                                         sendResponse = true;
                                         sendOK = false;
@@ -405 +397 @@
                 catch(BoxException &e)
                 {
-                        ::syslog(LOG_ERR, "Communication error with "
-                                "control client: %s", e.what());
+                        BOX_ERROR("Communication error with "
+                                "control client: " << e.what());
                 }
                 catch(std::exception &e)
                 {
-                        ::syslog(LOG_ERR, "Internal error in command socket "
-                                "thread: %s", e.what());
+                        BOX_ERROR("Internal error in command socket "
+                                "thread: " << e.what());
                 }
                 catch(...)
                 {
-                        ::syslog(LOG_ERR, "Communication error with control client");
+                        BOX_ERROR("Communication error with control client");
                 }
         }
@@ -474 +466 @@
                         catch(std::exception &e)
                         {
-                                ::syslog(LOG_WARNING, "Internal error while "
+                                BOX_WARNING("Internal error while "
                                         "closing command socket after "
-                                        "another exception: %s", e.what());
+                                        "another exception: " << e.what());
                         }
                         catch(...)
                         {
-                                ::syslog(LOG_WARNING,
-                                        "Error closing command socket "
+                                BOX_WARNING("Error closing command socket "
                                         "after exception, ignored.");
                         }
@@ -675 +666 @@
                                 !DeleteStoreObjectInfo())
                         {
-                                ::syslog(LOG_ERR, "Failed to delete the "
+                                BOX_ERROR("Failed to delete the "
                                         "StoreObjectInfoFile, backup cannot "
                                         "continue safely.");
@@ -698 +689 @@
                                 // Set state and log start
                                 SetState(State_Connected);
-                                ::syslog(LOG_INFO, "Beginning scan of local files");
+                                BOX_INFO("Beginning scan of local files");
 
                                 std::string extendedLogFile;
@@ -811 +802 @@
 
                                 // Log
-                                ::syslog(LOG_INFO, "Finished scan of local files");
+                                BOX_INFO("Finished scan of local files");
 
                                 // --------------------------------------------------------------------------------------------
@@ -835 +826 @@
                         catch(std::exception &e)
                         {
-                                ::syslog(LOG_ERR, "Internal error during "
-                                        "backup run: %s", e.what());
+                                BOX_ERROR("Internal error during "
+                                        "backup run: " << e.what());
                                 errorOccurred = true;
                         }
@@ -865 +856 @@
                                 if(StopRun())
                                 {
-                                        ::syslog(LOG_INFO, "Exception (%d/%d) due to signal", errorCode, errorSubCode);
+                                        BOX_INFO("Exception (" << errorCode
+                                                << "/" << errorSubCode 
+                                                << ") due to signal");
                                         return;
                                 }
@@ -872 +865 @@
                                 if(isBerkelyDbFailure)
                                 {
-                                        ::syslog(LOG_ERR, "Berkely db inode map files corrupted, deleting and restarting scan. Renamed files and directories will not be tracked until after this scan.\n");
+                                        BOX_ERROR("Berkely db inode map files corrupted, deleting and restarting scan. Renamed files and directories will not be tracked until after this scan.");
                                         ::sleep(1);
                                 }
@@ -879 +872 @@
                                         // Not restart/terminate, pause and retry
                                         SetState(State_Error);
-                                        ::syslog(LOG_ERR, 
-                                                "Exception caught (%s %d/%d), "
-                                                "reset state and waiting "
-                                                "to retry...", 
-                                                errorString, errorCode, 
-                                                errorSubCode);
+                                        BOX_ERROR("Exception caught ("
+                                                << errorString
+                                                << " " << errorCode
+                                                << "/" << errorSubCode
+                                                << "), reset state and "
+                                                "waiting to retry...");
                                         ::sleep(10);
                                         nextSyncTime = currentSyncStartTime + 
@@ -895 +888 @@
 
                         // Log the stats
-                        ::syslog(LOG_INFO, "File statistics: total file size uploaded %lld, bytes already on server %lld, encoded size %lld",
-                                BackupStoreFile::msStats.mBytesInEncodedFiles, BackupStoreFile::msStats.mBytesAlreadyOnServer,
-                                BackupStoreFile::msStats.mTotalFileStreamSize);
+                        BOX_INFO("File statistics: total file size uploaded "
+                                << BackupStoreFile::msStats.mBytesInEncodedFiles
+                                << ", bytes already on server "
+                                << BackupStoreFile::msStats.mBytesAlreadyOnServer
+                                << ", encoded size "
+                                << BackupStoreFile::msStats.mTotalFileStreamSize);
                         BackupStoreFile::ResetStats();
 
@@ -967 +963 @@
                                 catch(ConversionException &e)
                                 {
-                                        ::syslog(LOG_ERR, "Invalid output "
-                                                "from SyncAllowScript '%s': "
-                                                "'%s'", 
-                                                conf.GetKeyValue("SyncAllowScript").c_str(),
-                                                line.c_str());
+                                        BOX_ERROR("Invalid output "
+                                                "from SyncAllowScript '"
+                                                << conf.GetKeyValue("SyncAllowScript")
+                                                << "': '" << line << "'");
                                         throw;
                                 }
 
-                                ::syslog(LOG_INFO, "Delaying sync by %d seconds (SyncAllowScript '%s')", waitInSeconds, conf.GetKeyValue("SyncAllowScript").c_str());
+                                BOX_INFO("Delaying sync by " << waitInSeconds
+                                        << " seconds (SyncAllowScript '"
+                                        << conf.GetKeyValue("SyncAllowScript")
+                                        << "')");
                         }
                 }
@@ -982 +980 @@
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Internal error running SyncAllowScript: "
-                        "%s", e.what());
+                BOX_ERROR("Internal error running SyncAllowScript: "
+                        << e.what());
         }
         catch(...)
@@ -989 +987 @@
                 // Ignore any exceptions
                 // Log that something bad happened
-                ::syslog(LOG_ERR, "Error running SyncAllowScript '%s'", conf.GetKeyValue("SyncAllowScript").c_str());
+                BOX_ERROR("Error running SyncAllowScript '"
+                        << conf.GetKeyValue("SyncAllowScript") << "'");
         }
 
@@ -1041 +1040 @@
         if(mpCommandSocketInfo == 0) {::sleep(1); return;} // failure case isn't too bad
         
-        TRACE1("Wait on command socket, delay = %lld\n", RequiredDelay);
+        BOX_TRACE("Wait on command socket, delay = " << RequiredDelay);
         
         try
@@ -1067 +1066 @@
 #ifdef PLATFORM_CANNOT_FIND_PEER_UID_OF_UNIX_SOCKET
                                 bool uidOK = true;
-                                ::syslog(LOG_WARNING, "On this platform, no security check can be made on the credentials of peers connecting to the command socket. (bbackupctl)");
+                                BOX_WARNING("On this platform, no security check can be made on the credentials of peers connecting to the command socket. (bbackupctl)");
 #else
                                 // Security check -- does the process connecting to this socket have
@@ -1092 +1091 @@
                                 {
                                         // Dump the connection
-                                        ::syslog(LOG_ERR, "Incoming command connection from peer had different user ID than this process, or security check could not be completed.");
+                                        BOX_ERROR("Incoming command connection from peer had different user ID than this process, or security check could not be completed.");
                                         mpCommandSocketInfo->mpConnectedSocket.reset();
                                         return;
@@ -1099 +1098 @@
                                 {
                                         // Log
-                                        ::syslog(LOG_INFO, "Connection from command socket");
+                                        BOX_INFO("Connection from command socket");
                                         
                                         // Send a header line summarising the configuration and current state
@@ -1137 +1136 @@
                         && mpCommandSocketInfo->mpGetLine->GetLine(command, false /* no preprocessing */, timeout))
                 {
-                        TRACE1("Receiving command '%s' over command socket\n", command.c_str());
+                        BOX_TRACE("Receiving command '" << command 
+                                << "' over command socket");
                         
                         bool sendOK = false;
@@ -1194 +1194 @@
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Internal error in command socket thread: "
-                        "%s", e.what());
+                BOX_ERROR("Internal error in command socket thread: "
+                        << e.what());
                 // If an error occurs, and there is a connection active, just close that
                 // connection and continue. Otherwise, let the error propagate.
@@ -1239 +1239 @@
         try
         {
-                TRACE0("Closing command connection\n");
+                BOX_TRACE("Closing command connection");
                 
                 if(mpCommandSocketInfo->mpGetLine)
@@ -1250 +1250 @@
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Internal error while closing command "
-                        "socket: %s", e.what());
+                BOX_ERROR("Internal error while closing command "
+                        "socket: " << e.what());
         }
         catch(...)
@@ -1300 +1300 @@
                 catch(std::exception &e)
                 {
-                        ::syslog(LOG_ERR, "Internal error while sending to "
-                                "command socket client: %s", e.what());
+                        BOX_ERROR("Internal error while sending to "
+                                "command socket client: " << e.what());
                         CloseCommandConnection();
                 }
@@ -1404 +1404 @@
                 while((entry = ::getmntent(mountPointsFile)) != 0)
                 {
-                        TRACE1("Found mount point at %s\n", entry->mnt_dir);
+                        BOX_TRACE("Found mount point at " << entry->mnt_dir);
                         mountPoints.insert(std::string(entry->mnt_dir));
                 }
@@ -1426 +1426 @@
         try
         {
-
                 // Read all the entries, and put them in the set
                 struct mnttab entry;
                 while(getmntent(mountPointsFile, &entry) == 0)
                 {
-                        TRACE1("Found mount point at %s\n", entry.mnt_mountp);
+                        BOX_TRACE("Found mount point at " << entry.mnt_mountp);
                         mountPoints.insert(std::string(entry.mnt_mountp));
                 }
@@ -1460 +1459 @@
                 i != rLocationsConf.mSubConfigurations.end(); ++i)
         {
-TRACE0("new location\n");
+                BOX_TRACE("new location");
                 // Create a record for it
                 Location *ploc = new Location;
@@ -1498 +1497 @@
                                 if(ploc->mPath[0] != '/')
                                 {
-                                        ::syslog(LOG_ERR, "Location path '%s' isn't absolute", ploc->mPath.c_str());
+                                        BOX_WARNING("Location path '"
+                                                << ploc->mPath 
+                                                << "' is not absolute");
                                 }
                                 // Go through the mount points found, and find a suitable one
@@ -1504 +1505 @@
                                 {
                                         std::set<std::string, mntLenCompare>::const_iterator i(mountPoints.begin());
-                                        TRACE1("%d potential mount points\n", mountPoints.size());
+                                        BOX_TRACE(mountPoints.size() 
+                                                << " potential mount points");
                                         for(; i != mountPoints.end(); ++i)
                                         {
@@ -1510 +1512 @@
                                                 // If it matches, the file belongs in that mount point
                                                 // (sorting order ensures this)
-                                                TRACE1("checking against mount point %s\n", i->c_str());
+                                                BOX_TRACE("checking against mount point " << *i);
                                                 if(::strncmp(i->c_str(), ploc->mPath.c_str(), i->size()) == 0)
                                                 {
@@ -1518 +1520 @@
                                                 }
                                         }
-                                        TRACE2("mount point chosen for %s is %s\n", ploc->mPath.c_str(), mountName.c_str());
+                                        BOX_TRACE("mount point chosen for "
+                                                << ploc->mPath << " is "
+                                                << mountName);
                                 }
 
@@ -1572 +1576 @@
                                 catch (BoxException &e)
                                 {
-                                        ::syslog(LOG_ERR, "Failed to get attributes for path "
-                                                "'%s', skipping.", ploc->mPath.c_str());
+                                        BOX_ERROR("Failed to get attributes "
+                                                "for path '" << ploc->mPath
+                                                << "', skipping.");
                                         continue;
                                 }
@@ -1599 +1604 @@
                         delete ploc;
                         ploc = 0;
-                        ::syslog(LOG_ERR, "Failed to setup location '%s' path '%s'",
-                                ploc->mName.c_str(), ploc->mPath.c_str());
+                        BOX_ERROR("Failed to setup location '"
+                                << ploc->mName << "' path '"
+                                << ploc->mPath << "'");
                         throw;
                 }
@@ -1608 +1614 @@
         if(dir.GetNumberOfEntries() > 0)
         {
-                ::syslog(LOG_INFO, "%d redundant locations in root directory found, will delete from store after %d seconds.",
-                        dir.GetNumberOfEntries(), BACKUP_DELETE_UNUSED_ROOT_ENTRIES_AFTER);
+                BOX_INFO(dir.GetNumberOfEntries() << " redundant locations "
+                        "in root directory found, will delete from store "
+                        "after " << BACKUP_DELETE_UNUSED_ROOT_ENTRIES_AFTER 
+                        << " seconds.");
 
                 // Store directories in list of things to delete
@@ -1622 +1630 @@
                         mUnusedRootDirEntries.push_back(std::pair<int64_t,std::string>(en->GetObjectID(), name));
                         // Log this
-                        ::syslog(LOG_INFO, "Unused location in root: %s", name.c_str());
+                        BOX_INFO("Unused location in root: " << name);
                 }
                 ASSERT(mUnusedRootDirEntries.size() > 0);
@@ -1739 +1747 @@
                 
                 // Delete the file
-                TRACE1("Deleting %s\n", filename.c_str());
+                BOX_TRACE("Deleting " << filename);
                 ::unlink(filename.c_str());
                 
@@ -1746 +1754 @@
 
                 // Delete that too
-                TRACE1("Deleting %s\n", filename.c_str());
+                BOX_TRACE("Deleting " << filename);
                 ::unlink(filename.c_str());
         }
@@ -1826 +1834 @@
                 if(::rename(newmap.c_str(), target.c_str()) != 0)
                 {
-                        ::syslog(LOG_ERR, "failed to rename ID map: "
-                                "%s to %s: %s",
-                                newmap.c_str(), target.c_str(),
-                                strerror(errno));
+                        BOX_ERROR("failed to rename ID map: " << newmap
+                                << " to " << target << ": " 
+                                << strerror(errno));
                         THROW_EXCEPTION(CommonException, OSFileError)
                 }
@@ -1932 +1939 @@
                 catch(std::exception &e)
                 {
-                        ::syslog(LOG_ERR, "Internal error while writing state "
-                                "to command socket: %s", e.what());
+                        BOX_ERROR("Internal error while writing state "
+                                "to command socket: " << e.what());
                         CloseCommandConnection();
                 }
@@ -1951 +1958 @@
                 catch(std::exception &e)
                 {
-                        ::syslog(LOG_ERR, "Internal error while writing state "
-                                "to command socket: %s", e.what());
+                        BOX_ERROR("Internal error while writing state "
+                                "to command socket: " << e.what());
                         CloseCommandConnection();
                 }
@@ -1997 +2004 @@
         static const char *sEventNames[] = {"store-full", "read-error", 0};
 
-        TRACE1("BackupDaemon::NotifySysadmin() called, event = %d\n", Event);
+        BOX_TRACE("BackupDaemon::NotifySysadmin() called, event = " << Event);
 
         if(Event < 0 || Event > NotifyEvent__MAX)
@@ -2015 +2022 @@
         {
                 // Log, and then return
-                ::syslog(LOG_ERR, "Not notifying administrator about event %s -- set NotifyScript to do this in future", sEventNames[Event]);
+                BOX_ERROR("Not notifying administrator about event "
+                        << sEventNames[Event] << " -- set NotifyScript "
+                        "to do this in future");
                 return;
         }
@@ -2023 +2032 @@
         
         // Log what we're about to do
-        ::syslog(LOG_INFO, "About to notify administrator about event %s, running script '%s'", sEventNames[Event], script.c_str());
+        BOX_INFO("About to notify administrator about event "
+                << sEventNames[Event] << ", running script '"
+                << script << "'");
         
         // Then do it
         if(::system(script.c_str()) != 0)
         {
-                ::syslog(LOG_ERR, "Notify script returned an error code. ('%s')", script.c_str());
+                BOX_ERROR("Notify script returned an error code. ('"
+                        << script << "')");
         }
 
@@ -2060 +2072 @@
 
         // Entries to delete, and it's the right time to do so...
-        ::syslog(LOG_INFO, "Deleting unused locations from store root...");
+        BOX_INFO("Deleting unused locations from store root...");
         BackupProtocolClient &connection(rContext.GetConnection());
         for(std::vector<std::pair<int64_t,std::string> >::iterator i(mUnusedRootDirEntries.begin()); i != mUnusedRootDirEntries.end(); ++i)
@@ -2067 +2079 @@
                 
                 // Log this
-                ::syslog(LOG_INFO, "Deleted %s (ID %08llx) from store root", i->second.c_str(), i->first);
+                BOX_INFO("Deleted " << i->second << " (ID " << i->first
+                        << ") from store root");
         }
 
@@ -2407 +2420 @@
                 //
                 aFile.Close();
-                ::syslog(LOG_INFO, "Saved store object info file '%s'", 
-                        StoreObjectInfoFile.c_str());
+                BOX_INFO("Saved store object info file: "
+                        << StoreObjectInfoFile);
         }
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Internal error writing store object "
-                        "info file (%s): %s",
-                        StoreObjectInfoFile.c_str(), e.what());
+                BOX_ERROR("Internal error writing store object "
+                        "info file (" << StoreObjectInfoFile << "): "
+                        << e.what());
         }
         catch(...)
         {
-                ::syslog(LOG_ERR, "Internal error writing store object "
-                        "info file (%s): unknown error",
-                        StoreObjectInfoFile.c_str());
+                BOX_ERROR("Internal error writing store object "
+                        "info file (" << StoreObjectInfoFile << "): "
+                        "unknown error");
         }
 
@@ -2471 +2484 @@
                 if(iMagicValue != STOREOBJECTINFO_MAGIC_ID_VALUE)
                 {
-                        ::syslog(LOG_WARNING, "Store object info file '%s' "
+                        BOX_WARNING("Store object info file "
                                 "is not a valid or compatible serialised "
-                                "archive. Will re-cache from store.", 
-                                StoreObjectInfoFile.c_str());
+                                "archive. Will re-cache from store. "
+                                "(" << StoreObjectInfoFile << ")");
                         return false;
                 }
@@ -2486 +2499 @@
                 if(strMagicValue != STOREOBJECTINFO_MAGIC_ID_STRING)
                 {
-                        ::syslog(LOG_WARNING, "Store object info file '%s' "
+                        BOX_WARNING("Store object info file "
                                 "is not a valid or compatible serialised "
-                                "archive. Will re-cache from store.", 
-                                StoreObjectInfoFile.c_str());
+                                "archive. Will re-cache from store. "
+                                "(" << StoreObjectInfoFile << ")");
                         return false;
                 }
@@ -2502 +2515 @@
                 if(iVersion != STOREOBJECTINFO_VERSION)
                 {
-                        ::syslog(LOG_WARNING, "Store object info file '%s' "
-                                "version %d unsupported. "
-                                "Will re-cache from store.", 
-                                StoreObjectInfoFile.c_str(), 
-                                iVersion);
+                        BOX_WARNING("Store object info file "
+                                "version " << iVersion << " unsupported. "
+                                "Will re-cache from store. "
+                                "(" << StoreObjectInfoFile << ")");
                         return false;
                 }
@@ -2519 +2531 @@
                 if(lastKnownConfigModTime != GetLoadedConfigModifiedTime())
                 {
-                        ::syslog(LOG_WARNING, "Store object info file '%s' "
-                                "out of date. Will re-cache from store", 
-                                StoreObjectInfoFile.c_str());
+                        BOX_WARNING("Store object info file "
+                                "out of date. Will re-cache from store. "
+                                "(" << StoreObjectInfoFile << ")");
                         return false;
                 }
@@ -2568 +2580 @@
                 //
                 aFile.Close();
-                ::syslog(LOG_INFO, "Loaded store object info file '%s', "
-                        "version [%d]", StoreObjectInfoFile.c_str(), 
-                        iVersion);
-
+                BOX_INFO("Loaded store object info file version " << iVersion
+                        << "(" << StoreObjectInfoFile << ")");
+                
                 return true;
         } 
         catch(std::exception &e)
         {
-                ::syslog(LOG_ERR, "Internal error reading store object "
-                        "info file (%s): %s",
-                        StoreObjectInfoFile.c_str(), e.what());
+                BOX_ERROR("Internal error reading store object info file: "
+                        << StoreObjectInfoFile << ": " << e.what());
         }
         catch(...)
         {
-                ::syslog(LOG_ERR, "Internal error reading store object "
-                        "info file (%s): unknown error",
-                        StoreObjectInfoFile.c_str());
+                BOX_ERROR("Internal error reading store object info file: "
+                        << StoreObjectInfoFile << ": unknown error");
         }
 
@@ -2593 +2602 @@
         theNextSyncTime = 0;
 
-        ::syslog(LOG_WARNING, "Requested store object info file '%s' "
-                "does not exist, not accessible, or inconsistent. "
-                "Will re-cache from store.", 
-                StoreObjectInfoFile.c_str());
-
+        BOX_WARNING("Store object info file is missing, not accessible, "
+                "or inconsistent. Will re-cache from store. "
+                "(" << StoreObjectInfoFile << ")");
+        
         return false;
 }
@@ -2625 +2633 @@
         {
                 // File doesn't exist -- so can't be deleted. But something isn't quite right, so log a message
-                ::syslog(LOG_ERR, "Expected to be able to delete "
-                        "store object info file '%s', but the file did not exist.",
-                        storeObjectInfoFile.c_str());
+                BOX_WARNING("Store object info file did not exist when it "
+                        "was supposed to. (" << storeObjectInfoFile << ")");
+
                 // Return true to stop things going around in a loop
                 return true;
@@ -2635 +2643 @@
         if(::unlink(storeObjectInfoFile.c_str()) != 0)
         {
-                ::syslog(LOG_ERR, "Failed to delete the old "
-                        "store object info file '%s': %s",
-                        storeObjectInfoFile.c_str(), strerror(errno));
+                BOX_ERROR("Failed to delete the old store object info file: "
+                        << storeObjectInfoFile << ": "<< strerror(errno));
                 return false;
         }