set uptime format to float; update minor version as api changed

This commit is contained in:
yggverse 2026-03-28 20:32:32 +02:00
parent da6e64f74b
commit c329428609
5 changed files with 16 additions and 16 deletions

2
Cargo.lock generated
View file

@ -1429,7 +1429,7 @@ dependencies = [
[[package]]
name = "psocks"
version = "0.5.0"
version = "0.6.0"
dependencies = [
"anyhow",
"env_logger",

View file

@ -1,6 +1,6 @@
[package]
name = "psocks"
version = "0.5.0"
version = "0.6.0"
edition = "2024"
license = "MIT"
readme = "README.md"

View file

@ -27,7 +27,7 @@ async fn index(
let r = rules.read().await;
Json(totals.inner().snap(
stats::Rules::from_totals(r.total(true), r.total(false)),
startup_time.elapsed().as_secs(),
startup_time.elapsed().as_secs_f32(),
))
}
@ -40,7 +40,7 @@ async fn api_totals(
let r = rules.read().await;
Json(totals.inner().snap(
stats::Rules::from_totals(r.total(true), r.total(false)),
startup_time.elapsed().as_secs(),
startup_time.elapsed().as_secs_f32(),
))
}

View file

@ -11,7 +11,7 @@ pub struct Total {
}
impl Total {
pub fn snap(&self, rules: Rules, seconds_from_startup: u64) -> Snap {
pub fn snap(&self, rules: Rules, seconds_from_startup: f32) -> Snap {
Snap::shot(
rules,
self.request.load(Ordering::Relaxed),

View file

@ -2,19 +2,19 @@ use rocket::serde::Serialize;
#[derive(Serialize)]
pub struct Up {
seconds: u64,
minutes: u64,
hours: u64,
days: u64,
weeks: u64,
seconds: f32,
minutes: f32,
hours: f32,
days: f32,
weeks: f32,
}
impl Up {
pub fn from_startup_seconds(seconds: u64) -> Self {
let minutes = seconds / 60;
let hours = minutes / 60;
let days = hours / 24;
let weeks = days / 7;
pub fn from_startup_seconds(seconds: f32) -> Self {
let minutes = seconds / 60.;
let hours = minutes / 60.;
let days = hours / 24.;
let weeks = days / 7.;
Self {
seconds,
minutes,
@ -63,7 +63,7 @@ pub struct Snap {
}
impl Snap {
pub fn shot(rules: Rules, request: u64, blocked: u64, seconds_from_startup: u64) -> Self {
pub fn shot(rules: Rules, request: u64, blocked: u64, seconds_from_startup: f32) -> Self {
let blocked_percent = if request > 0 {
blocked as f32 * 100.0 / request as f32
} else {