From f03845226376b716bc8323b056804ec5ffa02ad3 Mon Sep 17 00:00:00 2001
From: Edward Shen <code@eddie.sh>
Date: Thu, 27 May 2021 16:22:15 -0400
Subject: [PATCH] Fix logging messages

---
 src/ping.rs   | 7 ++++---
 src/routes.rs | 2 +-
 src/state.rs  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ping.rs b/src/ping.rs
index 2a650ca..8b67c85 100644
--- a/src/ping.rs
+++ b/src/ping.rs
@@ -176,9 +176,10 @@ pub async fn update_server_state(secret: &str, cli: &CliArgs, data: &mut Arc<RwL
                 debug!("got write guard for server state");
                 let mut write_guard = data.0.write();
 
-                if !write_guard.url_overridden && write_guard.image_server != resp.image_server {
+                let image_server_changed = write_guard.image_server != resp.image_server;
+                if !write_guard.url_overridden && image_server_changed {
                     write_guard.image_server = resp.image_server;
-                } else {
+                } else if image_server_changed {
                     warn!("Ignoring new upstream url!");
                 }
 
@@ -220,7 +221,7 @@ pub async fn update_server_state(secret: &str, cli: &CliArgs, data: &mut Arc<RwL
                     PREVIOUSLY_COMPROMISED.store(resp.compromised, Ordering::Release);
                     if resp.compromised {
                         error!("Got compromised response from control center!");
-                    } else {
+                    } else if previously_compromised {
                         info!("No longer compromised!");
                     }
                 }
diff --git a/src/routes.rs b/src/routes.rs
index 45870d6..c7eeca3 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -11,7 +11,7 @@ use actix_web::{get, web::Data, HttpRequest, HttpResponse, Responder};
 use base64::DecodeError;
 use bytes::Bytes;
 use chrono::{DateTime, Utc};
-use futures::{AsyncReadExt, Stream, TryStreamExt};
+use futures::{Stream, TryStreamExt};
 use log::{debug, error, info, warn};
 use once_cell::sync::Lazy;
 use prometheus::{Encoder, TextEncoder};
diff --git a/src/state.rs b/src/state.rs
index 796bda3..b93be08 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -75,7 +75,7 @@ impl ServerState {
                             }
                         })?;
 
-                    PREVIOUSLY_COMPROMISED.store(resp.paused, Ordering::Release);
+                    PREVIOUSLY_COMPROMISED.store(resp.compromised, Ordering::Release);
                     if resp.compromised {
                         error!("Got compromised response from control center!");
                     }