aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfxqnlr <[email protected]>2024-06-13 16:54:35 +0200
committerfxqnlr <[email protected]>2024-06-13 16:54:35 +0200
commitc124f9fff690a42ea5fb490e4c7e512ba8448951 (patch)
treef17edd2042d2dc713f3dd6b0bdabbbb2444fc863 /src
parent04cd0aee6d000073e49b80a530a40cdb176f7f10 (diff)
downloadwebol-c124f9fff690a42ea5fb490e4c7e512ba8448951.tar
webol-c124f9fff690a42ea5fb490e4c7e512ba8448951.tar.gz
webol-c124f9fff690a42ea5fb490e4c7e512ba8448951.zip
cargo update + `time` update, fix for `Instant` deprecation
Diffstat (limited to 'src')
-rw-r--r--src/config.rs2
-rw-r--r--src/routes/start.rs4
-rw-r--r--src/services/ping.rs12
-rw-r--r--src/storage.rs4
4 files changed, 12 insertions, 10 deletions
diff --git a/src/config.rs b/src/config.rs
index bfb28be..7c91c08 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -7,7 +7,7 @@ use crate::auth;
7pub struct Config { 7pub struct Config {
8 pub serveraddr: String, 8 pub serveraddr: String,
9 pub pingtimeout: i64, 9 pub pingtimeout: i64,
10 pub pingthreshold: i64, 10 pub pingthreshold: u64,
11 pub timeoffset: i8, 11 pub timeoffset: i8,
12 pub auth: Auth, 12 pub auth: Auth,
13} 13}
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 192a54a..0b6b38b 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -128,14 +128,14 @@ fn setup_ping(state: Arc<crate::AppState>, device: Device) -> String {
128 uuid_ret 128 uuid_ret
129} 129}
130 130
131fn get_eta(times: Option<Vec<i64>>) -> i64 { 131fn get_eta(times: Option<Vec<u64>>) -> u64 {
132 let times = if let Some(times) = times { 132 let times = if let Some(times) = times {
133 times 133 times
134 } else { 134 } else {
135 vec![0] 135 vec![0]
136 }; 136 };
137 137
138 times.iter().sum::<i64>() / i64::try_from(times.len()).unwrap() 138 times.iter().sum::<u64>() / u64::try_from(times.len()).unwrap()
139} 139}
140 140
141#[derive(Deserialize, ToSchema)] 141#[derive(Deserialize, ToSchema)]
diff --git a/src/services/ping.rs b/src/services/ping.rs
index 4e0ffcf..69c911f 100644
--- a/src/services/ping.rs
+++ b/src/services/ping.rs
@@ -2,8 +2,8 @@ use crate::config::Config;
2use crate::storage::Device; 2use crate::storage::Device;
3use dashmap::DashMap; 3use dashmap::DashMap;
4use ipnetwork::IpNetwork; 4use ipnetwork::IpNetwork;
5use std::fmt::Display; 5use std::{fmt::Display, time::Instant};
6use time::{Duration, Instant}; 6use time::Duration;
7use tokio::sync::broadcast::Sender; 7use tokio::sync::broadcast::Sender;
8use tracing::{debug, error, trace}; 8use tracing::{debug, error, trace};
9 9
@@ -12,7 +12,7 @@ pub type StatusMap = DashMap<String, Value>;
12#[derive(Debug, Clone)] 12#[derive(Debug, Clone)]
13pub struct Value { 13pub struct Value {
14 pub ip: IpNetwork, 14 pub ip: IpNetwork,
15 pub eta: i64, 15 pub eta: u64,
16 pub online: bool, 16 pub online: bool,
17} 17}
18 18
@@ -56,12 +56,12 @@ pub async fn spawn(
56 56
57 let _ = tx.send(msg.clone()); 57 let _ = tx.send(msg.clone());
58 if msg.command == BroadcastCommands::Success { 58 if msg.command == BroadcastCommands::Success {
59 if timer.elapsed().whole_seconds() > config.pingthreshold { 59 if timer.elapsed().as_secs() > config.pingthreshold {
60 let newtimes = if let Some(mut oldtimes) = device.times { 60 let newtimes = if let Some(mut oldtimes) = device.times {
61 oldtimes.push(timer.elapsed().whole_seconds()); 61 oldtimes.push(timer.elapsed().as_secs());
62 oldtimes 62 oldtimes
63 } else { 63 } else {
64 vec![timer.elapsed().whole_seconds()] 64 vec![timer.elapsed().as_secs()]
65 }; 65 };
66 66
67 let updatedev = Device { 67 let updatedev = Device {
diff --git a/src/storage.rs b/src/storage.rs
index 52c2e60..90ff1b4 100644
--- a/src/storage.rs
+++ b/src/storage.rs
@@ -19,7 +19,7 @@ pub struct Device {
19 pub mac: MacAddress, 19 pub mac: MacAddress,
20 pub broadcast_addr: String, 20 pub broadcast_addr: String,
21 pub ip: Option<IpNetwork>, 21 pub ip: Option<IpNetwork>,
22 pub times: Option<Vec<i64>>, 22 pub times: Option<Vec<u64>>,
23} 23}
24 24
25impl Device { 25impl Device {
@@ -59,6 +59,8 @@ impl Device {
59 } 59 }
60} 60}
61 61
62// Dead Code allowed because of use in OpenApi Macro (not really dead code)
63#[allow(dead_code)]
62#[derive(ToSchema)] 64#[derive(ToSchema)]
63#[schema(as = Device)] 65#[schema(as = Device)]
64pub struct DeviceSchema { 66pub struct DeviceSchema {