diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /src/BackupIPv4ConnectCommand.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/BackupIPv4ConnectCommand.cc')
| -rw-r--r-- | src/BackupIPv4ConnectCommand.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/BackupIPv4ConnectCommand.cc b/src/BackupIPv4ConnectCommand.cc index 9ca2081b..5c61434b 100644 --- a/src/BackupIPv4ConnectCommand.cc +++ b/src/BackupIPv4ConnectCommand.cc @@ -51,7 +51,7 @@ BackupConnectInfo::BackupConnectInfo() BackupIPv4ConnectCommand::BackupIPv4ConnectCommand (cuid_t cuid, const std::string& ipaddr, uint16_t port, - const SharedHandle<BackupConnectInfo>& info, Command* mainCommand, + const std::shared_ptr<BackupConnectInfo>& info, Command* mainCommand, RequestGroup* requestGroup, DownloadEngine* e) : Command(cuid), ipaddr_(ipaddr), @@ -83,14 +83,15 @@ bool BackupIPv4ConnectCommand::execute() if(requestGroup_->downloadFinished() || requestGroup_->isHaltRequested()) { retval = true; } else if(info_->cancel) { - A2_LOG_INFO(fmt("CUID#%"PRId64" - Backup connection canceled", getCuid())); + A2_LOG_INFO(fmt("CUID#%" PRId64 " - Backup connection canceled", + getCuid())); retval = true; } else if(socket_) { if(writeEventEnabled()) { try { std::string error = socket_->getSocketError(); if(error.empty()) { - A2_LOG_INFO(fmt("CUID#%"PRId64" - Backup connection to %s " + A2_LOG_INFO(fmt("CUID#%" PRId64 " - Backup connection to %s " "established", getCuid(), ipaddr_.c_str())); info_->ipaddr = ipaddr_; e_->deleteSocketForWriteCheck(socket_, this); @@ -99,12 +100,12 @@ bool BackupIPv4ConnectCommand::execute() e_->setNoWait(true); retval = true; } else { - A2_LOG_INFO(fmt("CUID#%"PRId64" - Backup connection failed: %s", + A2_LOG_INFO(fmt("CUID#%" PRId64 " - Backup connection failed: %s", getCuid(), error.c_str())); retval = true; } } catch(RecoverableException& e) { - A2_LOG_INFO_EX(fmt("CUID#%"PRId64" - Backup connection failed", + A2_LOG_INFO_EX(fmt("CUID#%" PRId64 " - Backup connection failed", getCuid()), e); retval = true; } @@ -120,14 +121,14 @@ bool BackupIPv4ConnectCommand::execute() e_->addSocketForWriteCheck(socket_, this); timeoutCheck_ = global::wallclock(); } catch(RecoverableException& e) { - A2_LOG_INFO_EX(fmt("CUID#%"PRId64" - Backup connection failed", + A2_LOG_INFO_EX(fmt("CUID#%" PRId64 " - Backup connection failed", getCuid()), e); socket_.reset(); retval = true; } } } else if(timeoutCheck_.difference(global::wallclock()) >= timeout_) { - A2_LOG_INFO(fmt("CUID#%"PRId64" - Backup connection command timeout", + A2_LOG_INFO(fmt("CUID#%" PRId64 " - Backup connection command timeout", getCuid())); retval = true; } |