astelm
/
telemt
mirror of https://github.com/telemt/telemt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shutdown Timer fixes

This commit is contained in:
Alexey 2026-03-05 16:04:32 +03:00
parent 3260746785
commit d62a6e0417
No known key found for this signature in database
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.rs
View File

@ -182,7 +182,7 @@ fn format_uptime(total_secs: u64) -> String {
const SECS_PER_HOUR: u64 = 60 * SECS_PER_MINUTE; const SECS_PER_HOUR: u64 = 60 * SECS_PER_MINUTE;
const SECS_PER_DAY: u64 = 24 * SECS_PER_HOUR; const SECS_PER_DAY: u64 = 24 * SECS_PER_HOUR;
const SECS_PER_MONTH: u64 = 30 * SECS_PER_DAY; const SECS_PER_MONTH: u64 = 30 * SECS_PER_DAY;
const SECS_PER_YEAR: u64 = 365 * SECS_PER_DAY; const SECS_PER_YEAR: u64 = 12 * SECS_PER_MONTH;
let mut remaining = total_secs; let mut remaining = total_secs;
let years = remaining / SECS_PER_YEAR; let years = remaining / SECS_PER_YEAR;
@ -197,35 +197,35 @@ fn format_uptime(total_secs: u64) -> String {
let seconds = remaining % SECS_PER_MINUTE; let seconds = remaining % SECS_PER_MINUTE;
let mut parts = Vec::new(); let mut parts = Vec::new();
if years > 0 { if total_secs > SECS_PER_YEAR {
parts.push(format!( parts.push(format!(
"{} {}", "{} {}",
years, years,
unit_label(years, "year", "years") unit_label(years, "year", "years")
)); ));
} }
if total_secs >= SECS_PER_YEAR { if total_secs > SECS_PER_MONTH {
parts.push(format!( parts.push(format!(
"{} {}", "{} {}",
months, months,
unit_label(months, "month", "months") unit_label(months, "month", "months")
)); ));
} }
if total_secs >= SECS_PER_MONTH { if total_secs > SECS_PER_DAY {
parts.push(format!( parts.push(format!(
"{} {}", "{} {}",
days, days,
unit_label(days, "day", "days") unit_label(days, "day", "days")
)); ));
} }
if total_secs >= SECS_PER_DAY { if total_secs > SECS_PER_HOUR {
parts.push(format!( parts.push(format!(
"{} {}", "{} {}",
hours, hours,
unit_label(hours, "hour", "hours") unit_label(hours, "hour", "hours")
)); ));
} }
if total_secs >= SECS_PER_HOUR { if total_secs > SECS_PER_MINUTE {
parts.push(format!( parts.push(format!(
"{} {}", "{} {}",
minutes, minutes,
@ -1032,7 +1032,7 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
let initialized_secs = process_started_at.elapsed().as_secs(); let initialized_secs = process_started_at.elapsed().as_secs();
let second_suffix = if initialized_secs == 1 { "" } else { "s" }; let second_suffix = if initialized_secs == 1 { "" } else { "s" };
info!("================= Telegram Startup ================="); info!("===================== Telegram Startup =====================");
info!( info!(
" DC/ME Initialized in {} second{}", " DC/ME Initialized in {} second{}",
initialized_secs, second_suffix initialized_secs, second_suffix
@ -1593,9 +1593,10 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
match signal::ctrl_c().await { match signal::ctrl_c().await {
Ok(()) => { Ok(()) => {
let shutdown_started_at = Instant::now();
info!("Shutting down...");
let uptime_secs = process_started_at.elapsed().as_secs(); let uptime_secs = process_started_at.elapsed().as_secs();
info!("Uptime: {}", format_uptime(uptime_secs)); info!("Uptime: {}", format_uptime(uptime_secs));
info!("Shutting down...");
if let Some(pool) = &me_pool { if let Some(pool) = &me_pool {
match tokio::time::timeout( match tokio::time::timeout(
Duration::from_secs(2), Duration::from_secs(2),
@ -1614,6 +1615,12 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
} }
} }
} }
let shutdown_secs = shutdown_started_at.elapsed().as_secs();
info!(
"Shutdown completed successfully in {} {}.",
shutdown_secs,
unit_label(shutdown_secs, "second", "seconds")
);
} }
Err(e) => error!("Signal error: {}", e), Err(e) => error!("Signal error: {}", e),
} }