Skip to content

Feature: Enhance secondary switch #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
burningtnt merged 2 commits into from
Jan 2, 2026
Merged

Feature: Enhance secondary switch #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b479d1e
Fix: secondary switch
burningtnt Jan 2, 2026
1cfce22
Code cleanup.
burningtnt Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 18 additions & 35 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,47 +486,30 @@ async fn main_secondary(port: u16, mode: Mode) {
async fn secondary_switch(port: u16) -> Option<Lock> {
let client = reqwest::Client::new();

let Ok(response) = client
.get(format!("http://127.0.0.1:{}/meta", port))
.send()
.await
else {
return None;
};
let Ok(body) = response.text().await else {
return None;
};
let body = client
.get(format!("http://127.0.0.1:{}/meta", port)).send().await.ok()?
.text().await.ok()?;
let compile_timestamp = serde_json::from_str::<'_, serde_json::Value>(&body).ok()?
.get("compile_timestamp")?.as_str()?.parse::<u128>().ok()?;

let Ok(value) = serde_json::from_str::<'_, serde_json::Value>(&body) else {
if timestamp::compile_time!() <= compile_timestamp {
return None;
};
let Some(compile_timestamp) = value.get("compile_timestamp").and_then(|v| v.as_str()) else {
return None;
};
}

if let Ok(running) = compile_timestamp.parse::<u128>() && timestamp::compile_time!() > running
{
let Ok(response) = client
.get(format!("http://127.0.0.1:{}/panic?peaceful=true", port))
.send()
.await
else {
return None;
};
let _ = client.get(format!("http://127.0.0.1:{}/panic?peaceful=true", port)).send().await;
rocket::tokio::time::sleep(Duration::from_millis(3000)).await;

if response.status().as_u16() == 502 {
thread::sleep(Duration::from_millis(1500));
let state = Lock::get_state();
return match &state {
Lock::Single { .. } => {
logging!("UI", "Running in server mode.");
Some(state)
}
Lock::Secondary { .. } | Lock::Unknown => None,
};
let state = Lock::get_state();
match &state {
Lock::Single { .. } => {
logging!("UI", "Took over from legacy Terracotta.");
Some(state)
}
Lock::Secondary { .. } | Lock::Unknown => {
logging!("UI", "Failed to take over from legacy Terracotta: global mutex hasn't been released after 3000ms.");
None
},
}
return None;
}

fn output_port(port: u16, file: String) {
Expand Down