Commit a223ec18 authored by James Vecore's avatar James Vecore Committed by Chromium LUCI CQ

[Nearby] Remove excessive logging

kInProgress transfer updates were being logged multiple times making
logs hard to read.

Change-Id: I7e1ea61db26e9532c415be86ca8feea1c9573883
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2591775
Auto-Submit: James Vecore <vecore@google.com>
Reviewed-by: default avatarJosh Nohle <nohle@chromium.org>
Commit-Queue: Josh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837070}
parent 344a078a
...@@ -527,12 +527,6 @@ NearbyNotificationManager::~NearbyNotificationManager() { ...@@ -527,12 +527,6 @@ NearbyNotificationManager::~NearbyNotificationManager() {
void NearbyNotificationManager::OnTransferUpdate( void NearbyNotificationManager::OnTransferUpdate(
const ShareTarget& share_target, const ShareTarget& share_target,
const TransferMetadata& transfer_metadata) { const TransferMetadata& transfer_metadata) {
NS_LOG(VERBOSE) << __func__ << ": Nearby notification manager: "
<< "Transfer update for share target with ID "
<< share_target.id << ": "
<< TransferMetadata::StatusToString(
transfer_metadata.status());
if (!share_target_) if (!share_target_)
share_target_ = share_target; share_target_ = share_target;
DCHECK_EQ(share_target_->id, share_target.id); DCHECK_EQ(share_target_->id, share_target.id);
......
...@@ -202,14 +202,14 @@ class TransferUpdateDecorator : public TransferUpdateCallback { ...@@ -202,14 +202,14 @@ class TransferUpdateDecorator : public TransferUpdateCallback {
void OnTransferUpdate(const ShareTarget& share_target, void OnTransferUpdate(const ShareTarget& share_target,
const TransferMetadata& transfer_metadata) override { const TransferMetadata& transfer_metadata) override {
NS_LOG(VERBOSE) << __func__ << ": Transfer update decorator: "
<< "Transfer update for share target with ID "
<< share_target.id << ": "
<< TransferMetadata::StatusToString(
transfer_metadata.status());
if (got_final_status_) { if (got_final_status_) {
// If we already got a final status, we can ignore any subsequent final // If we already got a final status, we can ignore any subsequent final
// statuses caused by race conditions. // statuses caused by race conditions.
NS_LOG(VERBOSE)
<< __func__ << ": Transfer update decorator swallowed "
<< "status update because a final status was already received: "
<< share_target.id << ": "
<< TransferMetadata::StatusToString(transfer_metadata.status());
return; return;
} }
got_final_status_ = transfer_metadata.is_final_status(); got_final_status_ = transfer_metadata.is_final_status();
...@@ -2429,10 +2429,13 @@ void NearbySharingServiceImpl::OnIncomingAdvertisementDecoded( ...@@ -2429,10 +2429,13 @@ void NearbySharingServiceImpl::OnIncomingAdvertisementDecoded(
void NearbySharingServiceImpl::OnIncomingTransferUpdate( void NearbySharingServiceImpl::OnIncomingTransferUpdate(
const ShareTarget& share_target, const ShareTarget& share_target,
const TransferMetadata& metadata) { const TransferMetadata& metadata) {
// kInProgress status is logged extensively elsewhere so avoid the spam.
if (metadata.status() != TransferMetadata::Status::kInProgress) {
NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: " NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: "
<< "Incoming transfer update for share target with ID " << "Incoming transfer update for share target with ID "
<< share_target.id << ": " << share_target.id << ": "
<< TransferMetadata::StatusToString(metadata.status()); << TransferMetadata::StatusToString(metadata.status());
}
if (metadata.status() != TransferMetadata::Status::kCancelled && if (metadata.status() != TransferMetadata::Status::kCancelled &&
metadata.status() != TransferMetadata::Status::kRejected) { metadata.status() != TransferMetadata::Status::kRejected) {
last_incoming_metadata_ = last_incoming_metadata_ =
...@@ -2470,10 +2473,13 @@ void NearbySharingServiceImpl::OnIncomingTransferUpdate( ...@@ -2470,10 +2473,13 @@ void NearbySharingServiceImpl::OnIncomingTransferUpdate(
void NearbySharingServiceImpl::OnOutgoingTransferUpdate( void NearbySharingServiceImpl::OnOutgoingTransferUpdate(
const ShareTarget& share_target, const ShareTarget& share_target,
const TransferMetadata& metadata) { const TransferMetadata& metadata) {
// kInProgress status is logged extensively elsewhere so avoid the spam.
if (metadata.status() != TransferMetadata::Status::kInProgress) {
NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: " NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: "
<< "Outgoing transfer update for share target with ID " << "Outgoing transfer update for share target with ID "
<< share_target.id << ": " << share_target.id << ": "
<< TransferMetadata::StatusToString(metadata.status()); << TransferMetadata::StatusToString(metadata.status());
}
if (metadata.is_final_status()) { if (metadata.is_final_status()) {
is_connecting_ = false; is_connecting_ = false;
...@@ -3221,10 +3227,13 @@ base::Optional<ShareTarget> NearbySharingServiceImpl::CreateShareTarget( ...@@ -3221,10 +3227,13 @@ base::Optional<ShareTarget> NearbySharingServiceImpl::CreateShareTarget(
void NearbySharingServiceImpl::OnPayloadTransferUpdate( void NearbySharingServiceImpl::OnPayloadTransferUpdate(
ShareTarget share_target, ShareTarget share_target,
TransferMetadata metadata) { TransferMetadata metadata) {
// kInProgress status is logged extensively elsewhere so avoid the spam.
if (metadata.status() != TransferMetadata::Status::kInProgress) {
NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: " NS_LOG(VERBOSE) << __func__ << ": Nearby Share service: "
<< "Payload transfer update for share target with ID " << "Payload transfer update for share target with ID "
<< share_target.id << ": " << share_target.id << ": "
<< TransferMetadata::StatusToString(metadata.status()); << TransferMetadata::StatusToString(metadata.status());
}
if (metadata.status() == TransferMetadata::Status::kComplete && if (metadata.status() == TransferMetadata::Status::kComplete &&
share_target.is_incoming && !OnIncomingPayloadsComplete(share_target)) { share_target.is_incoming && !OnIncomingPayloadsComplete(share_target)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment