From a59f0b18ca9aae98ea35b0d347a6f94e85cd072c Mon Sep 17 00:00:00 2001 From: elvece Date: Tue, 12 Oct 2021 13:32:57 -0600 Subject: [PATCH] fix output error on stop --- appmgr/src/manager/mod.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appmgr/src/manager/mod.rs b/appmgr/src/manager/mod.rs index de6644868..abef607eb 100644 --- a/appmgr/src/manager/mod.rs +++ b/appmgr/src/manager/mod.rs @@ -15,6 +15,7 @@ use torut::onion::TorSecretKeyV3; use tracing::instrument; use crate::action::docker::DockerAction; +use crate::action::NoOutput; use crate::context::RpcContext; use crate::net::interface::InterfaceId; use crate::notifications::{NotificationLevel, NotificationSubtype}; @@ -143,13 +144,15 @@ pub enum OnStop { } #[instrument(skip(state))] -async fn run_main(state: &Arc) -> Result, Error> { +async fn run_main( + state: &Arc, +) -> Result, Error> { let rt_state = state.clone(); let mut runtime = tokio::spawn(async move { rt_state .manifest .main - .execute::<(), ()>( + .execute::<(), NoOutput>( &rt_state.ctx, &rt_state.manifest.id, &rt_state.manifest.version, @@ -300,7 +303,7 @@ impl Manager { } } match run_main(&thread_shared).await { - Ok(Ok(())) => { + Ok(Ok(NoOutput)) => { thread_shared .on_stop .send(OnStop::Sleep)