diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 22:11:45 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 22:11:45 +0000 |
| commit | f2e6283815f4b598f3aa13441f82228370b8d077 (patch) | |
| tree | 82886fbcbce618878dff2fb2ab6229d91e2f69d1 /bin/bbstored | |
| parent | d5f9f9c253584cc12cd88c83afd6c6bfcc6ebd68 (diff) | |
Undo mangling by tailor
Diffstat (limited to 'bin/bbstored')
| -rw-r--r-- | bin/bbstored/BBStoreDHousekeeping.cpp | 3 | ||||
| -rw-r--r-- | bin/bbstored/BackupContext.cpp | 3 | ||||
| -rwxr-xr-x | bin/bbstored/bbstored-config.in | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/bin/bbstored/BBStoreDHousekeeping.cpp b/bin/bbstored/BBStoreDHousekeeping.cpp index 16a1432a..4694c0bb 100644 --- a/bin/bbstored/BBStoreDHousekeeping.cpp +++ b/bin/bbstored/BBStoreDHousekeeping.cpp @@ -193,7 +193,8 @@ bool BackupStoreDaemon::CheckForInterProcessMsg(int AccountNum, int MaximumWaitT std::string line; if(mInterProcessComms.GetLine(line, false /* no pre-processing */, MaximumWaitTime)) { - TRACE1("Housekeeping received command '%s' over interprocess comms\n", line.c_str()); + BOX_TRACE("Housekeeping received command '" << line << + "' over interprocess comms"); int account = 0; diff --git a/bin/bbstored/BackupContext.cpp b/bin/bbstored/BackupContext.cpp index f956b1a8..af1c9475 100644 --- a/bin/bbstored/BackupContext.cpp +++ b/bin/bbstored/BackupContext.cpp @@ -382,7 +382,8 @@ int64_t BackupContext::AllocateObjectID() // Mark that the store info should be saved as soon as possible mSaveStoreInfoDelay = 0; - TRACE1("When allocating object ID, found that %lld is already in use\n", id); + BOX_WARNING("When allocating object ID, found that " << + BOX_FORMAT_OBJECTID(id) << " is already in use"); } THROW_EXCEPTION(BackupStoreException, CouldNotFindUnusedIDDuringAllocation) diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in index 57fa50c6..5ad96d50 100755 --- a/bin/bbstored/bbstored-config.in +++ b/bin/bbstored/bbstored-config.in @@ -196,7 +196,7 @@ TimeBetweenHousekeeping = 900 Server { - PidFile = @localstatedir_expanded@/bbstored.pid + PidFile = @localstatedir_expanded@/run/bbstored.pid User = $username ListenAddresses = inet:$server CertificateFile = $certificate |