From f2e6283815f4b598f3aa13441f82228370b8d077 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Fri, 4 Apr 2008 22:11:45 +0000
Subject: Undo mangling by tailor

---
 bin/bbackupd/BackupDaemon.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'bin/bbackupd/BackupDaemon.cpp')

diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index 059cda38..b1dc4832 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -958,6 +958,7 @@ void BackupDaemon::Run2()
 					*this, 
 					tlsContext, 
 					conf.GetKeyValue("StoreHostname"),
+					conf.GetKeyValueInt("StorePort"),
 					conf.GetKeyValueInt("AccountNumber"), 
 					conf.GetKeyValueBool("ExtendedLogging"),
 					conf.KeyExists("ExtendedLogFile"),
@@ -1812,10 +1813,9 @@ void BackupDaemon::SetupLocations(BackupClientContext &rClientContext, const Con
 				if(::statfs(apLoc->mPath.c_str(), &s) != 0)
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
 				{
-					BOX_WARNING("Failed to stat location "
+					BOX_LOG_SYS_WARNING("Failed to stat location "
 						"path '" << apLoc->mPath <<
-						"' (" << strerror(errno) <<
-						"), skipping location '" <<
+						"', skipping location '" <<
 						apLoc->mName << "'");
 					continue;
 				}
@@ -2189,9 +2189,8 @@ void BackupDaemon::CommitIDMapsAfterSync()
 #endif
 		if(::rename(newmap.c_str(), target.c_str()) != 0)
 		{
-			BOX_ERROR("failed to rename ID map: " << newmap
-				<< " to " << target << ": " 
-				<< strerror(errno));
+			BOX_LOG_SYS_ERROR("Failed to rename ID map: " <<
+				newmap << " to " << target);
 			THROW_EXCEPTION(CommonException, OSFileError)
 		}
 	}
@@ -3055,9 +3054,10 @@ bool BackupDaemon::DeleteStoreObjectInfo() const
 	// Check to see if the file exists
 	if(!FileExists(storeObjectInfoFile.c_str()))
 	{
-		// File doesn't exist -- so can't be deleted. But something isn't quite right, so log a message
-		BOX_WARNING("Store object info file did not exist when it "
-			"was supposed to. (" << storeObjectInfoFile << ")");
+		// File doesn't exist -- so can't be deleted. But something
+		// isn't quite right, so log a message
+		BOX_WARNING("StoreObjectInfoFile did not exist when it "
+			"was supposed to: " << storeObjectInfoFile);
 
 		// Return true to stop things going around in a loop
 		return true;
@@ -3066,8 +3066,8 @@ bool BackupDaemon::DeleteStoreObjectInfo() const
 	// Actually delete it
 	if(::unlink(storeObjectInfoFile.c_str()) != 0)
 	{
-		BOX_ERROR("Failed to delete the old store object info file: "
-			<< storeObjectInfoFile << ": "<< strerror(errno));
+		BOX_LOG_SYS_ERROR("Failed to delete the old "
+			"StoreObjectInfoFile: " << storeObjectInfoFile);
 		return false;
 	}
 
-- 
cgit v1.2.3