From 3661f3624acc46590d5504fda4f8714255fb2c8e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 4 Apr 2008 21:59:29 +0000 Subject: 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 --- bin/bbstored/BBStoreDHousekeeping.cpp | 3 +-- bin/bbstored/BackupContext.cpp | 3 +-- bin/bbstored/bbstored-config.in | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'bin/bbstored') diff --git a/bin/bbstored/BBStoreDHousekeeping.cpp b/bin/bbstored/BBStoreDHousekeeping.cpp index 4694c0bb..16a1432a 100644 --- a/bin/bbstored/BBStoreDHousekeeping.cpp +++ b/bin/bbstored/BBStoreDHousekeeping.cpp @@ -193,8 +193,7 @@ bool BackupStoreDaemon::CheckForInterProcessMsg(int AccountNum, int MaximumWaitT std::string line; if(mInterProcessComms.GetLine(line, false /* no pre-processing */, MaximumWaitTime)) { - BOX_TRACE("Housekeeping received command '" << line << - "' over interprocess comms"); + TRACE1("Housekeeping received command '%s' over interprocess comms\n", line.c_str()); int account = 0; diff --git a/bin/bbstored/BackupContext.cpp b/bin/bbstored/BackupContext.cpp index af1c9475..f956b1a8 100644 --- a/bin/bbstored/BackupContext.cpp +++ b/bin/bbstored/BackupContext.cpp @@ -382,8 +382,7 @@ int64_t BackupContext::AllocateObjectID() // Mark that the store info should be saved as soon as possible mSaveStoreInfoDelay = 0; - BOX_WARNING("When allocating object ID, found that " << - BOX_FORMAT_OBJECTID(id) << " is already in use"); + TRACE1("When allocating object ID, found that %lld is already in use\n", id); } THROW_EXCEPTION(BackupStoreException, CouldNotFindUnusedIDDuringAllocation) diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in index 5ad96d50..57fa50c6 100755 --- a/bin/bbstored/bbstored-config.in +++ b/bin/bbstored/bbstored-config.in @@ -196,7 +196,7 @@ TimeBetweenHousekeeping = 900 Server { - PidFile = @localstatedir_expanded@/run/bbstored.pid + PidFile = @localstatedir_expanded@/bbstored.pid User = $username ListenAddresses = inet:$server CertificateFile = $certificate -- cgit v1.2.3