vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'info-to-warn' into 'main' 

Change log levels of messages from INFO to others

Closes #854

See merge request tpo/core/arti!1172
This commit is contained in:
gabi-250 2023-05-17 12:41:26 +00:00
parent fb8bc19b9b e9dff1c0d7
commit ac0eb05a07
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/tor-circmgr/src/mgr.rs
View File

@ -490,7 +490,7 @@ struct CircList<B: AbstractCircBuilder> {
/// open circuits. /// open circuits.
/// ///
/// A circuit is added here from [`AbstractCircMgr::do_launch`] when we find /// A circuit is added here from [`AbstractCircMgr::do_launch`] when we find
/// that it completes successfully, and has not been cancelled. /// that it completes successfully, and has not been cancelled.
/// When we decide that such a circuit should no longer be handed out for /// When we decide that such a circuit should no longer be handed out for
/// any new requests, we "retire" the circuit by removing it from this map. /// any new requests, we "retire" the circuit by removing it from this map.
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
@ -515,7 +515,7 @@ struct CircList<B: AbstractCircBuilder> {
/// decide that a circuit needs to be launched. /// decide that a circuit needs to be launched.
/// ///
/// Later, in [`AbstractCircMgr::do_launch`], once the circuit has finished /// Later, in [`AbstractCircMgr::do_launch`], once the circuit has finished
/// (or failed), we remove the entry (by pointer identity). /// (or failed), we remove the entry (by pointer identity).
/// If we cannot find the entry, we conclude that the request has been /// If we cannot find the entry, we conclude that the request has been
/// _cancelled_, and so we discard any circuit that was created. /// _cancelled_, and so we discard any circuit that was created.
pending_circs: PtrWeakHashSet<Weak<PendingEntry<B>>>, pending_circs: PtrWeakHashSet<Weak<PendingEntry<B>>>,
@ -862,12 +862,13 @@ impl<B: AbstractCircBuilder + 'static, R: Runtime> AbstractCircMgr<B, R> {
match outcome { match outcome {
Ok(Ok(circ)) => return Ok(circ), Ok(Ok(circ)) => return Ok(circ),
Ok(Err(e)) => { Ok(Err(e)) => {
info!("Circuit attempt {} failed.", attempt_num); debug!("Circuit attempt {} failed.", attempt_num);
Error::RequestFailed(e) Error::RequestFailed(e)
} }
Err(_) => { Err(_) => {
// We ran out of "remaining" time; there is nothing // We ran out of "remaining" time; there is nothing
// more to be done. // more to be done.
warn!("All circuit attempts failed due to timeout");
retry_err.push(Error::RequestTimeout); retry_err.push(Error::RequestTimeout);
break; break;
} }
@ -875,7 +876,7 @@ impl<B: AbstractCircBuilder + 'static, R: Runtime> AbstractCircMgr<B, R> {
} }
Err(e) => { Err(e) => {
// We couldn't pick the action! // We couldn't pick the action!
info!( debug!(
"Couldn't pick action for circuit attempt {}: {}", "Couldn't pick action for circuit attempt {}: {}",
attempt_num, attempt_num,
e.report(), e.report(),
@ -903,6 +904,7 @@ impl<B: AbstractCircBuilder + 'static, R: Runtime> AbstractCircMgr<B, R> {
*count += 1; *count += 1;
// If we have reached our limit of this kind of problem, we're done. // If we have reached our limit of this kind of problem, we're done.
if *count >= count_limit { if *count >= count_limit {
warn!("Reached circuit build retry limit, exiting...");
break; break;
} }
@ -918,6 +920,7 @@ impl<B: AbstractCircBuilder + 'static, R: Runtime> AbstractCircMgr<B, R> {
} }
} }
warn!("Request failed");
Err(Error::RequestFailed(retry_err)) Err(Error::RequestFailed(retry_err))
} }
@ -1177,7 +1180,7 @@ impl<B: AbstractCircBuilder + 'static, R: Runtime> AbstractCircMgr<B, R> {
} }
} }
info!( debug!(
"While waiting on circuit: {:?} from {}", "While waiting on circuit: {:?} from {}",
id, id,
describe_source(building, src) describe_source(building, src)