DefaultPeerStorage: Log origPort in checkoutPeer and returnPeer

Also make the log level warning when the returned peer is not found.
pull/150/head
Tatsuhiro Tsujikawa 2013-10-26 19:58:53 +09:00
parent 4c181a08b7
commit 12fe61820a
1 changed files with 4 additions and 4 deletions

View File

@ -234,7 +234,7 @@ std::shared_ptr<Peer> DefaultPeerStorage::checkoutPeer(cuid_t cuid)
peer->usedBy(cuid); peer->usedBy(cuid);
usedPeers_.insert(peer); usedPeers_.insert(peer);
A2_LOG_DEBUG(fmt("Checkout peer %s:%u to CUID#%" PRId64, A2_LOG_DEBUG(fmt("Checkout peer %s:%u to CUID#%" PRId64,
peer->getIPAddress().c_str(), peer->getPort(), peer->getIPAddress().c_str(), peer->getOrigPort(),
peer->usedBy())); peer->usedBy()));
return peer; return peer;
} }
@ -264,14 +264,14 @@ void DefaultPeerStorage::onReturningPeer(const std::shared_ptr<Peer>& peer)
void DefaultPeerStorage::returnPeer(const std::shared_ptr<Peer>& peer) void DefaultPeerStorage::returnPeer(const std::shared_ptr<Peer>& peer)
{ {
A2_LOG_DEBUG(fmt("Peer %s:%u returned from CUID#%" PRId64, A2_LOG_DEBUG(fmt("Peer %s:%u returned from CUID#%" PRId64,
peer->getIPAddress().c_str(), peer->getPort(), peer->getIPAddress().c_str(), peer->getOrigPort(),
peer->usedBy())); peer->usedBy()));
if(usedPeers_.erase(peer)) { if(usedPeers_.erase(peer)) {
onReturningPeer(peer); onReturningPeer(peer);
onErasingPeer(peer); onErasingPeer(peer);
} else { } else {
A2_LOG_DEBUG(fmt("Cannot find peer %s:%u in usedPeers_", A2_LOG_WARN(fmt("Cannot find peer %s:%u in usedPeers_",
peer->getIPAddress().c_str(), peer->getPort())); peer->getIPAddress().c_str(), peer->getOrigPort()));
} }
} }