GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

tor: online check frequency

Browse source
This commit is contained in:
ardocrat 2024-05-16 17:53:32 +03:00
parent 1ee9641b63
commit 50099da88c
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/tor/tor.rs
View file

@ -30,6 +30,7 @@ use curve25519_dalek::digest::Digest;
use parking_lot::RwLock; use parking_lot::RwLock;
use serde_json::json; use serde_json::json;
use sha2::Sha512; use sha2::Sha512;
use tokio::time::sleep;
use tor_config::CfgPath; use tor_config::CfgPath;
use tor_rtcompat::tokio::TokioNativeTlsRuntime; use tor_rtcompat::tokio::TokioNativeTlsRuntime;
use tor_rtcompat::Runtime; use tor_rtcompat::Runtime;
@ -219,6 +220,7 @@ impl Tor {
} }
let url = format!("http://{}/v2/foreign", service.onion_name().unwrap().to_string()); let url = format!("http://{}/v2/foreign", service.onion_name().unwrap().to_string());
thread::spawn(move || { thread::spawn(move || {
// Wait 5 seconds for service to start.
thread::sleep(Duration::from_millis(5000)); thread::sleep(Duration::from_millis(5000));
let runtime = TokioNativeTlsRuntime::create().unwrap(); let runtime = TokioNativeTlsRuntime::create().unwrap();
let client_runtime = runtime.clone(); let client_runtime = runtime.clone();
@ -230,6 +232,13 @@ impl Tor {
runtime runtime
.spawn(async move { .spawn(async move {
loop { loop {
if !Self::is_service_running(&service_id) &&
!Self::is_service_starting(&service_id) {
// Remove service from checking.
let mut w_services = TOR_SERVER_STATE.checking_services.write();
w_services.remove(&service_id);
break;
}
let data = json!({ let data = json!({
"id": 1, "id": 1,
"jsonrpc": "2.0", "jsonrpc": "2.0",
@ -248,13 +257,8 @@ impl Tor {
w_services.insert(service_id.clone()); w_services.insert(service_id.clone());
}, },
} }
if !Self::is_service_running(&service_id) && // Ping once per 10 second.
!Self::is_service_starting(&service_id) { sleep(Duration::from_millis(10000)).await;
// Remove service from checking.
let mut w_services = TOR_SERVER_STATE.checking_services.write();
w_services.remove(&service_id);
break;
}
} }
}).unwrap(); }).unwrap();
}); });