diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-02-09 13:51:32 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-02-09 13:51:32 +0000 |
| commit | 154751aa33300ffb4ae1bb50b9307b0ce5424be1 (patch) | |
| tree | c321531301821917ae0fbb55107160a9f7c09c25 | |
| parent | b2d91d52bae0d25b3bc8324d43b49b676ae1556e (diff) | |
Revert "Get backup connection stats from BackupProtocolServer."
Until the groundwork is prepared by changing Protocol's use of IOStream to
SocketStream.
This reverts commit 78531354753f3ce9bb3ef1d906b2aeaac5b73d58.
| -rw-r--r-- | bin/bbstored/BackupStoreDaemon.cpp | 14 | ||||
| -rw-r--r-- | bin/bbstored/BackupStoreDaemon.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/bbstored/BackupStoreDaemon.cpp b/bin/bbstored/BackupStoreDaemon.cpp index a2ac47a5..70ca1d67 100644 --- a/bin/bbstored/BackupStoreDaemon.cpp +++ b/bin/bbstored/BackupStoreDaemon.cpp @@ -355,22 +355,22 @@ void BackupStoreDaemon::Connection2(SocketStreamTLS &rStream) } catch(...) { - LogConnectionStats(id, context.GetAccountName(), server); + LogConnectionStats(id, context.GetAccountName(), rStream); throw; } - LogConnectionStats(id, context.GetAccountName(), server); + LogConnectionStats(id, context.GetAccountName(), rStream); context.CleanUp(); } void BackupStoreDaemon::LogConnectionStats(uint32_t accountId, - const std::string& accountName, const BackupProtocolServer &server) + const std::string& accountName, const SocketStreamTLS &s) { // Log the amount of data transferred BOX_NOTICE("Connection statistics for " << BOX_FORMAT_ACCOUNT(accountId) << " " "(name=" << accountName << "):" - " IN=" << server.GetBytesRead() << - " OUT=" << server.GetBytesWritten() << - " NET_IN=" << (server.GetBytesRead() - server.GetBytesWritten()) << - " TOTAL=" << (server.GetBytesRead() + server.GetBytesWritten())); + " IN=" << s.GetBytesRead() << + " OUT=" << s.GetBytesWritten() << + " NET_IN=" << (s.GetBytesRead() - s.GetBytesWritten()) << + " TOTAL=" << (s.GetBytesRead() + s.GetBytesWritten())); } diff --git a/bin/bbstored/BackupStoreDaemon.h b/bin/bbstored/BackupStoreDaemon.h index 40ef607d..ce538477 100644 --- a/bin/bbstored/BackupStoreDaemon.h +++ b/bin/bbstored/BackupStoreDaemon.h @@ -64,7 +64,7 @@ protected: void HousekeepingProcess(); void LogConnectionStats(uint32_t accountId, - const std::string& accountName, const BackupProtocolServer &server); + const std::string& accountName, const SocketStreamTLS &s); public: // HousekeepingInterface implementation |