Znachor/odproxy
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Better child killing

Browse source
This commit is contained in:
Filip Znachor 2023-05-12 00:10:22 +02:00
parent a31db191e8
commit d2efbe92ca
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data.rs
View file

@ -1,5 +1,6 @@
use std::{process::Child, sync::{Arc, Mutex}}; use std::{sync::{Arc, Mutex}};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use tokio::process::Child;
use std::collections::HashMap; use std::collections::HashMap;
use hyper::http::HeaderValue; use hyper::http::HeaderValue;

6
services.rs
View file

@ -1,5 +1,5 @@
use std::{process::{Command, Stdio, Child}, time::{Duration, SystemTime, UNIX_EPOCH}, path::Path, io::Error, thread}; use std::{process::Stdio, time::{Duration, SystemTime, UNIX_EPOCH}, path::Path, io::Error, thread};
use tokio::{time::sleep, fs}; use tokio::{process::{Command, Child}, time::sleep, fs};
use crate::{data::{SERVICES, ServiceData}, conf::{ProxyConf, CONFIG}}; use crate::{data::{SERVICES, ServiceData}, conf::{ProxyConf, CONFIG}};
@ -77,7 +77,7 @@ fn stop_service(index: usize) {
modify_service_data(index, |s| { modify_service_data(index, |s| {
match s.child.as_mut() { match s.child.as_mut() {
Some(c) => { Some(c) => {
c.kill().unwrap(); c.start_kill().unwrap();
}, },
None => {} None => {}
} }