forked from lx/netapp
Rewrite because clippy didn't understand drop
This commit is contained in:
parent
50806b54b7
commit
b14515a422
1 changed files with 23 additions and 21 deletions
|
@ -187,32 +187,34 @@ impl FullMeshPeeringStrategy {
|
|||
pub async fn run(self: Arc<Self>) {
|
||||
loop {
|
||||
// 1. Read current state: get list of connected peers (ping them)
|
||||
let known_hosts = self.known_hosts.read().unwrap();
|
||||
debug!("known_hosts: {} peers", known_hosts.list.len());
|
||||
let (to_ping, to_retry) = {
|
||||
let known_hosts = self.known_hosts.read().unwrap();
|
||||
debug!("known_hosts: {} peers", known_hosts.list.len());
|
||||
|
||||
let mut to_ping = vec![];
|
||||
let mut to_retry = vec![];
|
||||
for (id, info) in known_hosts.list.iter() {
|
||||
debug!("{}, {:?}", hex::encode(id), info);
|
||||
match info.state {
|
||||
PeerConnState::Connected => {
|
||||
let must_ping = match info.last_seen {
|
||||
None => true,
|
||||
Some(t) => Instant::now() - t > PING_INTERVAL,
|
||||
};
|
||||
if must_ping {
|
||||
to_ping.push(*id);
|
||||
let mut to_ping = vec![];
|
||||
let mut to_retry = vec![];
|
||||
for (id, info) in known_hosts.list.iter() {
|
||||
debug!("{}, {:?}", hex::encode(id), info);
|
||||
match info.state {
|
||||
PeerConnState::Connected => {
|
||||
let must_ping = match info.last_seen {
|
||||
None => true,
|
||||
Some(t) => Instant::now() - t > PING_INTERVAL,
|
||||
};
|
||||
if must_ping {
|
||||
to_ping.push(*id);
|
||||
}
|
||||
}
|
||||
}
|
||||
PeerConnState::Waiting(_, t) => {
|
||||
if Instant::now() >= t {
|
||||
to_retry.push(*id);
|
||||
PeerConnState::Waiting(_, t) => {
|
||||
if Instant::now() >= t {
|
||||
to_retry.push(*id);
|
||||
}
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
drop(known_hosts);
|
||||
(to_ping, to_retry)
|
||||
};
|
||||
|
||||
// 2. Dispatch ping to hosts
|
||||
trace!("to_ping: {} peers", to_retry.len());
|
||||
|
|
Loading…
Reference in a new issue