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

Merge branch 'ticket_383' into 'main' 

tor-chanmgr: Do not allocate an Internal error unless we mean it.

Closes #383

See merge request tpo/core/arti!394
This commit is contained in:
Ian Jackson 2022-03-09 11:30:08 +00:00
parent afa99cb1c8 a110755193
commit 3425a6cbcd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/tor-chanmgr/src/mgr.rs
View File

@ -129,7 +129,7 @@ impl<CF: ChannelFactory> AbstractChanMgr<CF> {
const N_ATTEMPTS: usize = 2;
// TODO(nickm): It would be neat to use tor_retry instead.
let mut last_err = Err(Error::Internal(internal!("Error was never set!?")));
let mut last_err = None;
for _ in 0..N_ATTEMPTS {
// First, see what state we're in, and what we should do
@ -183,11 +183,11 @@ impl<CF: ChannelFactory> AbstractChanMgr<CF> {
Action::Wait(pend) => match pend.await {
Ok(Ok(chan)) => return Ok(chan),
Ok(Err(e)) => {
last_err = Err(e);
last_err = Some(e);
}
Err(_) => {
last_err =
Err(Error::Internal(internal!("channel build task disappeared")));
Some(Error::Internal(internal!("channel build task disappeared")));
}
},
// We need to launch a channel.
@ -215,13 +215,13 @@ impl<CF: ChannelFactory> AbstractChanMgr<CF> {
self.channels.remove(&ident)?;
// (As above)
let _ignore_err = send.send(Err(e.clone()));
last_err = Err(e);
last_err = Some(e);
}
},
}
}
last_err
Err(last_err.unwrap_or_else(|| Error::Internal(internal!("no error was set!?"))))
}
/// Expire any channels that have been unused longer than