Rm loop run

config/default.toml

@@ -1,5 +1,3 @@
-reporting_interval_secs = 3600
-
 [mqtt]
 client_id = "affaldvarme"
 host = "10.0.1.3"

scripts/deploy-latest-and-run.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+image_name="untagged6785/ha-mitaffald"
+container_name="ha-mitaffald"
+
+docker pull $image_name:latest
+
+echo "Stopping container $container_name"
+docker stop $container_name || true
+
+echo "Removing container $container_name"
+docker rm $container_name || true
+
+echo "Starting new container"
+docker run -d --name $container_name -e affaldvarme.address.id -e mqtt.username -e mqtt.password --restart=on-failure:5 $image_name:latest

src/main.rs

@@ -3,26 +3,16 @@ use ha_mitaffald::sync_data;
 
 #[tokio::main]
 async fn main() {
-    loop {
-        println!("Starting data synchronization");
+    println!("Starting data synchronization");
 
-        let settings = Settings::new().expect("Failed to read settings");
-        let report_interval = tokio::time::Duration::from_secs(settings.reporting_interval_secs);
-        let report = sync_data(settings).await;
+    let settings = Settings::new().expect("Failed to read settings");
+    let report = sync_data(settings).await;
 
-        match report {
-            Ok(_) => println!("Data synchronization completed"),
-            Err(x) => eprintln!(
-                "Data synchronization failed (some entities may have been updated), error: {}",
-                x
-            ),
-        }
-
-        println!(
-            "Next synchronization will take place at: {}",
-            chrono::Local::now() + report_interval
-        );
-
-        tokio::time::sleep(report_interval).await;
+    match report {
+        Ok(_) => println!("Data synchronization completed"),
+        Err(x) => eprintln!(
+            "Data synchronization failed (some entities may have been updated), error: {}",
+            x
+        ),
     }
 }

src/settings.rs

@@ -7,15 +7,14 @@ use serde::Deserialize;
 pub struct Settings {
     pub mqtt: MQTTConfig,
     pub affaldvarme: AffaldVarmeConfig,
-    pub reporting_interval_secs: u64,
 }
 
 impl Settings {
     pub fn new() -> Result<Self, ConfigError> {
         let settings = Config::builder()
             .add_source(File::with_name("config/default.toml"))
             .add_source(File::with_name("config/secrets.toml").required(false))
-            .add_source(Environment::default())
+            .add_source(Environment::default().separator("_"))
             .build()?;
 
         settings.try_deserialize()

tests/full_flow_insta.rs

@@ -34,7 +34,6 @@ async fn smoke_test_insta() {
         .await;
 
     let settings = Settings {
-        reporting_interval_secs: 100,
         affaldvarme: AffaldVarmeConfig {
             address: Address::Id(AddressId { id: address_id }),
             base_url: mit_affald_server_url,