From 5a312b990033bae328667204aa2b6742e0b91469 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:55:55 -0600 Subject: [PATCH] use correct sigterm_timeout (#2480) --- backend/src/manager/manager_seed.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/src/manager/manager_seed.rs b/backend/src/manager/manager_seed.rs index 890e4a886..f90e7739f 100644 --- a/backend/src/manager/manager_seed.rs +++ b/backend/src/manager/manager_seed.rs @@ -1,6 +1,8 @@ use models::ErrorKind; use crate::context::RpcContext; +use crate::procedure::docker::DockerProcedure; +use crate::procedure::PackageProcedure; use crate::s9pk::manifest::Manifest; use crate::util::docker::stop_container; use crate::Error; @@ -16,11 +18,13 @@ impl ManagerSeed { pub async fn stop_container(&self) -> Result<(), Error> { match stop_container( &self.container_name, - self.manifest - .containers - .as_ref() - .and_then(|c| c.main.sigterm_timeout) - .map(|d| *d), + match &self.manifest.main { + PackageProcedure::Docker(DockerProcedure { + sigterm_timeout: Some(sigterm_timeout), + .. + }) => Some(**sigterm_timeout), + _ => None, + }, None, ) .await