diff options
author | Chris Wilson <chris+github@qwirx.com> | 2006-08-30 18:26:11 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2006-08-30 18:26:11 +0000 |
commit | 0d0ad416458a2bf4e04dfa35f549063b381c4e50 (patch) | |
tree | a6b9e977a7232f9b13f9513375d4d40e89f885a2 /bin | |
parent | d66c1cf54727d91ed8a1ef937c07ff32abb879d4 (diff) |
* bin/bbstored/BackupStoreDaemon.cpp
- Revert to trunk
Diffstat (limited to 'bin')
-rw-r--r-- | bin/bbstored/BackupStoreDaemon.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/bin/bbstored/BackupStoreDaemon.cpp b/bin/bbstored/BackupStoreDaemon.cpp index 24a81ceb..2752893a 100644 --- a/bin/bbstored/BackupStoreDaemon.cpp +++ b/bin/bbstored/BackupStoreDaemon.cpp @@ -11,11 +11,8 @@ #include <stdlib.h> #include <stdio.h> -#include <signal.h> - -#ifdef HAVE_SYSLOG_H #include <syslog.h> -#endif +#include <signal.h> #include "BackupContext.h" #include "BackupStoreDaemon.h" @@ -42,11 +39,7 @@ BackupStoreDaemon::BackupStoreDaemon() mExtendedLogging(false), mHaveForkedHousekeeping(false), mIsHousekeepingProcess(false), -#ifdef WIN32 - mHousekeepingInited(false) -#else mInterProcessComms(mInterProcessCommsSocket) -#endif { } @@ -163,7 +156,6 @@ void BackupStoreDaemon::Run() const Configuration &config(GetConfiguration()); mExtendedLogging = config.GetKeyValueBool("ExtendedLogging"); -#ifndef WIN32 // Fork off housekeeping daemon -- must only do this the first time Run() is called if(!mHaveForkedHousekeeping) { @@ -227,11 +219,9 @@ void BackupStoreDaemon::Run() } else { -#endif // !WIN32 // In server process -- use the base class to do the magic ServerTLS<BOX_PORT_BBSTORED>::Run(); -#ifndef WIN32 // Why did it stop? Tell the housekeeping process to do the same if(IsReloadConfigWanted()) { @@ -242,7 +232,6 @@ void BackupStoreDaemon::Run() mInterProcessCommsSocket.Write("t\n", 2); } } -#endif } @@ -308,8 +297,6 @@ void BackupStoreDaemon::LogConnectionStats(const char *commonName, // Log the amount of data transferred ::syslog(LOG_INFO, "Connection statistics for %s: " "IN=%lld OUT=%lld TOTAL=%lld\n", commonName, - (long long)s.GetBytesRead(), - (long long)s.GetBytesWritten(), - (long long)s.GetBytesRead() + - (long long)s.GetBytesWritten()); + s.GetBytesRead(), s.GetBytesWritten(), + s.GetBytesRead() + s.GetBytesWritten()); } |