From 34da31c92a7ff2badd407c07f0778fc803d44487 Mon Sep 17 00:00:00 2001 From: artem Date: Sun, 6 Oct 2024 22:12:27 +0200 Subject: [PATCH] tweaks --- backend/src/main.rs | 6 ++---- msrvmanager.service | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/src/main.rs b/backend/src/main.rs index 699825d..00645e0 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,7 +1,7 @@ #![recursion_limit = "1024"] use std::{fmt::Display, path::PathBuf, sync::Arc, time::Duration}; -use actix::{Actor, System}; +use actix::Actor; use actix_web::{get, guard, middleware::{ErrorHandlerResponse, ErrorHandlers}, route, web::{self, Data}, App, HttpRequest, HttpResponse, HttpServer, Responder}; use askama::Template; @@ -223,13 +223,11 @@ async fn main() -> std::io::Result<()> { tokio::spawn(async move { tokio::signal::ctrl_c().await.expect("Failed to listen for ctrl_c"); + log::info!("Received ctrl-c, stopping servers..."); native_clone.send(messages::native_messages::Stop).await.expect("Failed to stop servers"); server_handle.stop(true).await; - - log::info!("Shutting down..."); - System::current().stop(); }); server.await diff --git a/msrvmanager.service b/msrvmanager.service index b7d52f2..421efce 100644 --- a/msrvmanager.service +++ b/msrvmanager.service @@ -5,8 +5,8 @@ After=docker.service [Service] Restart=always -ExecStart=/usr/bin/docker run --rm --init --name MSrvM --network host -v /opt/msrvManager:/data msrvmanager -ExecStop=/usr/bin/docker stop -t 2 MSrvM +ExecStart=/usr/bin/docker run --name MSrvM --network host -v /opt/msrvManager:/data msrvmanager +ExecStop=/usr/bin/docker stop --signal SIGTERM -t 150 MSrvM ExecStopPost=/usr/bin/docker rm -f MSrvM [Install]