mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-12 18:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: terminate demo user job cleanly

Browse Source
This commit is contained in:
Aravinth Manivannan
2024-01-04 23:24:36 +05:30
parent 13c3066b86
commit e0d6188853
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@@ -12,6 +12,7 @@ use actix_web::{
error::InternalError, http::StatusCode, middleware as actix_middleware,
web::JsonConfig, App, HttpServer,
};
use tokio::task::JoinHandle;
use lazy_static::lazy_static;
use log::info;
@@ -110,11 +111,11 @@ async fn main() -> std::io::Result<()> {
let data = Data::new(&settings, secrets.clone()).await;
let data = actix_web::web::Data::new(data);
let mut demo_user: Option<DemoUser> = None;
let mut demo_user: Option<(DemoUser, JoinHandle<()>)> = None;
if settings.allow_demo && settings.allow_registration {
demo_user = Some(
DemoUser::spawn(data.clone(), Duration::from_secs(60 * 30))
DemoUser::spawn(data.clone(), 60 * 30)
.await
.unwrap(),
);
@@ -156,7 +157,8 @@ async fn main() -> std::io::Result<()> {
}
if let Some(demo_user) = demo_user {
demo_user.abort();
demo_user.0.abort();
demo_user.1.await.unwrap();
}
if let Some(survey_upload_handle) = survey_upload_handle {