liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

eyre work

Browse Source
This commit is contained in:
John Smith
2022-07-06 23:15:51 -04:00
parent 2f05611170
commit cd0cd78e30
21 changed files with 345 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
veilid-core/src/attachment_manager.rs
View File

@@ -222,26 +222,29 @@ impl AttachmentManager {
#[instrument(level = "debug", skip(self))]
async fn attachment_maintainer(self) {
trace!("attachment starting");
debug!("attachment starting");
let netman = {
let mut inner = self.inner.lock();
inner.attach_timestamp = Some(intf::get_timestamp());
inner.network_manager.clone()
};
let mut started = true;
if let Err(err) = netman.startup().await {
error!("network startup failed: {}", err);
started = false;
}
let mut restart;
loop {
restart = false;
if let Err(err) = netman.startup().await {
error!("network startup failed: {}", err);
netman.shutdown().await;
break;
}
if started {
trace!("started maintaining peers");
debug!("started maintaining peers");
while self.inner.lock().maintain_peers {
// tick network manager
if let Err(err) = netman.tick().await {
error!("Error in network manager: {}", err);
self.inner.lock().maintain_peers = false;
restart = true;
break;
}
@@ -250,10 +253,18 @@ impl AttachmentManager {
// sleep should be at the end in case maintain_peers changes state
intf::sleep(1000).await;
}
trace!("stopped maintaining peers");
debug!("stopped maintaining peers");
trace!("stopping network");
debug!("stopping network");
netman.shutdown().await;
if !restart {
break;
}
debug!("completely restarting attachment");
// chill out for a second first, give network stack time to settle out
intf::sleep(1000).await;
}
trace!("stopping attachment");
@@ -261,7 +272,7 @@ impl AttachmentManager {
let _output = attachment_machine
.consume(&AttachmentInput::AttachmentStopped)
.await;
trace!("attachment stopped");
debug!("attachment stopped");
self.inner.lock().attach_timestamp = None;
}