bo
/
modbusmqtt
1
0
Fork 0
Code Releases Activity

Decrease maximum wait time for crashed connection

main
Bo Jeanes 2022-09-29 18:19:29 +10:00
parent 4d43f8ef66
commit c5be6c1af8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modbus-mqtt/src/modbus/connection.rs
View File

@ -28,9 +28,9 @@ pub(crate) async fn run(
let address_offset = config.address_offset;
const MAX_WAIT: usize = 300;
const START_WAIT: usize = 2;
let mut current_wait = START_WAIT;
const MAX_WAIT: usize = 35;
let mut current_wait = 1;
let mut next_wait = 1;
loop {
match config.settings.connect(config.unit).await {
@ -57,13 +57,17 @@ pub(crate) async fn run(
mqtt.publish("last_error", format!("{error:?}"))
.await
.unwrap();
// TODO, reset current_wait to 0 if it's been a while since it crashed.
tokio::time::sleep(std::time::Duration::from_secs(current_wait as u64))
.await;
let Connection { rx: r, tx: t, .. } = conn;
rx = r;
tx = t;
current_wait = (current_wait * 2).clamp(START_WAIT, MAX_WAIT);
(current_wait, next_wait) =
(next_wait, (current_wait + next_wait).clamp(0, MAX_WAIT));
} else {
// we are shutting down here, so don't care if this fails
let send = mqtt.publish("state", "disconnected").await;