Add resync interval (#4)

* Add a resync interval and make some log messages better

* Add to changelog

* code fmt

Author: mikekap

CHANGELOG.md

@@ -0,0 +1,6 @@
+## NEXT
+ - Add resync interval
+ - Add some better log messages
+
+## 0.1.0
+ - First release, not in github

src/main.rs

@@ -107,6 +107,12 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
             .multiple(true)
             .takes_value(false)
             .about("verbosity level"))
+        .arg(Arg::with_name("resync-interval")
+            .short('i')
+            .required(false)
+            .takes_value(true)
+            .about("how frequently to check if the light changed state (e.g. via Wink or other external means)")
+            .default_value("10000"))
         .arg(Arg::with_name("mqtt-uri")
             .short('s')
             .required(true)
@@ -129,6 +135,10 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
             .default_value("homeassistant/status"))
         .get_matches();
 
+    let resync_interval: u64 = matches
+        .value_of_t("resync-interval")
+        .unwrap_or_else(|e| e.exit());
+
     let _guard = init_logger(&matches);
 
     let options = init_mqtt_client(&matches)?;
@@ -141,6 +151,7 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
         matches.value_of("topic-prefix").unwrap(),
         matches.value_of("discovery-prefix"),
         matches.value_of("discovery-listen-topic"),
+        resync_interval,
         controller,
     )
     .await;

src/syncer.rs

@@ -34,9 +34,10 @@ where
         topic_prefix: &str,
         discovery_prefix: Option<&str>,
         discovery_listen_topic: Option<&str>,
+        resync_interval: u64,
         controller: T,
     ) -> Arc<DeviceSyncer<T>> {
-        info!(slog_scope::logger(), "opening_client"; "host" => options.broker_address().0, "port" => options.broker_address().1);
+        info!(slog_scope::logger(), "opening_client"; "host" => options.broker_address().0, "port" => options.broker_address().1, "client_id" => &options.client_id());
         options.set_clean_session(true);
         let ev = EventLoop::new(options, 100).await;
         let (repoll_sender, repoll_rx) = bounded(10);
@@ -52,8 +53,12 @@ where
         let ptr_clone = ptr.clone();
         trace!(slog_scope::logger(), "start_thread");
         tokio::task::spawn(async move { Self::run_mqtt(ptr, ev).await });
+
         let ptr_2 = ptr_clone.clone();
-        tokio::task::spawn(async move { Self::run_poller(ptr_2, repoll_rx).await });
+        tokio::task::spawn(
+            async move { Self::run_poller(ptr_2, resync_interval, repoll_rx).await },
+        );
+
         if ptr_clone.discovery_prefix.is_some() {
             let ptr_3 = ptr_clone.clone();
             tokio::task::spawn(async move { Self::broadcast_discovery(ptr_3).await });
@@ -343,10 +348,11 @@ where
         Self::report_async_result("poll_all", Self::poll_all_(this).await)
     }
 
-    async fn run_poller(this: Arc<Self>, rx: Receiver<DeviceId>) -> () {
+    async fn run_poller(this: Arc<Self>, resync_interval: u64, rx: Receiver<DeviceId>) -> () {
         let that = this.clone();
+        info!(slog_scope::logger(), "poller_starting"; "resync_interval" => resync_interval);
         tokio::task::spawn(async move {
-            let mut timer = tokio::time::interval(Duration::from_secs(10));
+            let mut timer = tokio::time::interval(Duration::from_millis(resync_interval));
             loop {
                 timer.tick().await;
                 let _ = that.repoll.send(0).await;
@@ -387,6 +393,7 @@ where
                     device.id
                 );
                 let config = v.discovery_info.to_string();
+                info!(slog_scope::logger(), "discovered_device"; "id" => id, "name" => &device.name);
                 debug!(slog_scope::logger(), "broadcast_discovery_result"; "id" => id, "topic" => &topic, "config" => &config);
                 this.sender
                     .send(Request::Publish(Publish::new(