diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
| commit | 3661f3624acc46590d5504fda4f8714255fb2c8e (patch) | |
| tree | e2cd17e19718d3f46944979a23e4c93dcf92584b /bin/bbackupd/BackupDaemon.cpp | |
| parent | 2f8d0c29536cdb306b525b78638727da4ead0022 (diff) | |
Tailorization
Import of the upstream sources from
Repository: http://localhost:8000/
Kind: hg
Revision: 7807b7768163f1c2537756abe5416063989cebb1
Original author: tailor@rocio.int.aidworld.org
Date: 2008-03-16 19:44:36+00:00
Diffstat (limited to 'bin/bbackupd/BackupDaemon.cpp')
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index b1dc4832..059cda38 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -958,7 +958,6 @@ void BackupDaemon::Run2() *this, tlsContext, conf.GetKeyValue("StoreHostname"), - conf.GetKeyValueInt("StorePort"), conf.GetKeyValueInt("AccountNumber"), conf.GetKeyValueBool("ExtendedLogging"), conf.KeyExists("ExtendedLogFile"), @@ -1813,9 +1812,10 @@ void BackupDaemon::SetupLocations(BackupClientContext &rClientContext, const Con if(::statfs(apLoc->mPath.c_str(), &s) != 0) #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME { - BOX_LOG_SYS_WARNING("Failed to stat location " + BOX_WARNING("Failed to stat location " "path '" << apLoc->mPath << - "', skipping location '" << + "' (" << strerror(errno) << + "), skipping location '" << apLoc->mName << "'"); continue; } @@ -2189,8 +2189,9 @@ void BackupDaemon::CommitIDMapsAfterSync() #endif if(::rename(newmap.c_str(), target.c_str()) != 0) { - BOX_LOG_SYS_ERROR("Failed to rename ID map: " << - newmap << " to " << target); + BOX_ERROR("failed to rename ID map: " << newmap + << " to " << target << ": " + << strerror(errno)); THROW_EXCEPTION(CommonException, OSFileError) } } @@ -3054,10 +3055,9 @@ 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("StoreObjectInfoFile 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("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; @@ -3066,8 +3066,8 @@ bool BackupDaemon::DeleteStoreObjectInfo() const // Actually delete it if(::unlink(storeObjectInfoFile.c_str()) != 0) { - BOX_LOG_SYS_ERROR("Failed to delete the old " - "StoreObjectInfoFile: " << storeObjectInfoFile); + BOX_ERROR("Failed to delete the old store object info file: " + << storeObjectInfoFile << ": "<< strerror(errno)); return false; } |