Merge pull request #171 from sebadob/app-version-update-notifcation-i…

…mprovement only send out a notification about a new app version once after a restart
sebadob · Nov 14, 2023 · be19735 · be19735
2 parents 55433f4 + 55bde88
commit be19735
Showing 1 changed file with 27 additions and 13 deletions.
diff --git a/rauthy-main/src/schedulers.rs b/rauthy-main/src/schedulers.rs
@@ -16,6 +16,7 @@ use rauthy_models::events::event::Event;
 use rauthy_models::migration::backup_db;
 use rauthy_service::auth;
 use redhac::{cache_del, QuorumHealthState, QuorumState};
+use semver::Version;
 use std::collections::HashSet;
 use std::env;
 use std::ops::{Add, Sub};
@@ -512,21 +513,24 @@ pub async fn app_version_check(
         return;
     }
 
+    let mut last_version_notification = None;
+
     // do a first check shortly after startup to not wait hours on a fresh install
     // tokio::time::sleep(Duration::from_secs(10)).await;
     tokio::time::sleep(Duration::from_secs(120)).await;
-    check_app_version(&data, &rx_health).await;
+    check_app_version(&data, &rx_health, &mut last_version_notification).await;
 
     let mut interval = time::interval(Duration::from_secs(3595 * 8));
     loop {
         interval.tick().await;
-        check_app_version(&data, &rx_health).await;
+        check_app_version(&data, &rx_health, &mut last_version_notification).await;
     }
 }
 
 async fn check_app_version(
     data: &web::Data<AppState>,
     rx_health: &Receiver<Option<QuorumHealthState>>,
+    last_version_notification: &mut Option<Version>,
 ) {
     // will return None in a non-HA deployment
     if let Some(is_ha_leader) = is_ha_leader(rx_health) {
@@ -551,19 +555,29 @@ async fn check_app_version(
             let this_version = semver::Version::parse(RAUTHY_VERSION).unwrap();
 
             if latest_version > this_version && latest_version.pre.is_empty() {
-                info!("A new Rauthy App Version is available: {}", latest_version);
-                let version_url = format!("v{} -> {}", latest_version, url);
+                if last_version_notification.as_ref() == Some(&latest_version) {
+                    debug!(
+                        "Notified about version {} already - skipping it",
+                        latest_version
+                    );
+                } else {
+                    info!("A new Rauthy App Version is available: {}", latest_version);
+                    let version_url = format!("v{} -> {}", latest_version, url);
+
+                    if let Err(err) =
+                        LatestAppVersion::upsert(data, latest_version.clone(), version_url.clone())
+                            .await
+                    {
+                        error!("Saving LatestAppVersion into DB: {:?}", err);
+                    }
 
-                if let Err(err) =
-                    LatestAppVersion::upsert(data, latest_version, version_url.clone()).await
-                {
-                    error!("Saving LatestAppVersion into DB: {:?}", err);
-                }
+                    data.tx_events
+                        .send_async(Event::new_rauthy_version(version_url))
+                        .await
+                        .unwrap();
 
-                data.tx_events
-                    .send_async(Event::new_rauthy_version(version_url))
-                    .await
-                    .unwrap();
+                    *last_version_notification = Some(latest_version);
+                }
             } else {
                 debug!("No new Rauthy App Version available");
             }