mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-02 05:23:14 +00:00
fix deadlock on install (#2667)
* fix deadlock on install * improve pruning script * bump tokio
This commit is contained in:
@@ -374,9 +374,11 @@ impl Service {
|
||||
entry.as_icon_mut().ser(&icon)?;
|
||||
// TODO: marketplace url
|
||||
// TODO: dependency info
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.await?;
|
||||
|
||||
Ok(service)
|
||||
}
|
||||
|
||||
|
||||
@@ -294,9 +294,12 @@ impl ServiceMap {
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
drop(service);
|
||||
|
||||
sync_progress_task.await.map_err(|_| {
|
||||
Error::new(eyre!("progress sync task panicked"), ErrorKind::Unknown)
|
||||
})??;
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.boxed())
|
||||
|
||||
@@ -20,7 +20,6 @@ impl Handler<Restart> for ServiceActor {
|
||||
.except::<DependencyConfig>()
|
||||
}
|
||||
async fn handle(&mut self, _: Guid, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
|
||||
dbg!("here");
|
||||
// So Need a handle to just a single field in the state
|
||||
let temp = TempDesiredRestore::new(&self.0.persistent_container.state);
|
||||
let mut current = self.0.persistent_container.state.subscribe();
|
||||
@@ -77,7 +76,6 @@ impl Handler<Restart> for ServiceActor {
|
||||
impl Service {
|
||||
#[instrument(skip_all)]
|
||||
pub async fn restart(&self, id: Guid) -> Result<(), Error> {
|
||||
dbg!("here");
|
||||
self.actor.send(id, Restart).await
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user