github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-28 09:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

tor: remove delay after connection, immediately show service as started after bootstrap, remove unused features

Browse Source
This commit is contained in:
ardocrat
2026-05-20 18:14:06 +03:00
parent f31953f455
commit edc1a09b2c
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tor/tor.rs
+7 -10
View File
@@ -250,8 +250,6 @@ impl Tor {
}
}
};
// Wait 5s after launch.
thread::sleep(Duration::from_millis(5000));
TOR_STATE.client_launching.store(false, Ordering::Relaxed);
}
@@ -537,6 +535,11 @@ impl Tor {
let id = service_id.clone();
w_services.insert(id, (port, key.clone(), service, proxy));
}
// Remove service from starting.
{
let mut w_services = TOR_STATE.start.write();
w_services.remove(&service_id);
}
// Check service availability.
let addr = onion_addr.unwrap().display_unredacted().to_string();
let url = format!("http://{}/", addr);
@@ -577,8 +580,8 @@ impl Tor {
.block_on(async {
const MAX_ERRORS: i32 = 16;
let mut errors_count = 0;
// Wait 5 seconds.
tokio::time::sleep(Duration::from_millis(5000)).await;
// Wait 10 seconds.
tokio::time::sleep(Duration::from_millis(10000)).await;
loop {
if !Self::check_running(&service_id) {
break;
@@ -609,9 +612,6 @@ impl Tor {
// Remove service from checking.
let mut w_services = TOR_STATE.check.write();
w_services.remove(service_id);
// Remove service from starting.
let mut w_services = TOR_STATE.start.write();
w_services.remove(service_id);
}
// Restart services.
Self::restart();
@@ -626,9 +626,6 @@ impl Tor {
if !Self::check_running(&service_id) {
break;
}
// Remove service from starting.
let mut w_services = TOR_STATE.start.write();
w_services.remove(&service_id);
errors_count = 0;
// Check again after 60s.
Duration::from_millis(60000)