Fix review findings

eclipse-leda · Oct 25, 2023 · 0742ff0 · 0742ff0
1 parent b93fbdc
commit 0742ff0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/src/Context.h b/src/Context.h
@@ -62,7 +62,7 @@ namespace sua {
         std::string                             caFilepath       = SUA_DEFAULT_CA_FILEPATH;
         bool                                    downloadMode     = true;
         bool                                    fallbackMode     = false;
-        int                                     messageDelay     = SUA_DEFAULT_MESSAGE_DELAY;
+        int                                     feedbackInterval = SUA_DEFAULT_FEEDBACK_INTERVAL; // seconds
 
         DesiredState desiredState;
         CurrentState currentState;

diff --git a/src/Defaults.cpp b/src/Defaults.cpp
@@ -16,12 +16,12 @@
 
 #include "Defaults.h"
 
-const std::string SUA_DEFAULT_MQTT_PROTOCOL  = "tcp";
-const std::string SUA_DEFAULT_MQTT_HOST      = "mosquitto";
-const int         SUA_DEFAULT_MQTT_PORT      = 1883;
-const std::string SUA_DEFAULT_MQTT_SERVER    = "tcp://mosquitto:1883";
-const std::string SUA_DEFAULT_MODE           = "download";
-const std::string SUA_DEFAULT_TEMP_DIRECTORY = "/data/selfupdates";
-const std::string SUA_DEFAULT_CA_DIRECTORY   = "/etc/ssl/certs";
-const std::string SUA_DEFAULT_CA_FILEPATH    = "";
-const int         SUA_DEFAULT_MESSAGE_DELAY  = 5;
+const std::string SUA_DEFAULT_MQTT_PROTOCOL     = "tcp";
+const std::string SUA_DEFAULT_MQTT_HOST         = "mosquitto";
+const int         SUA_DEFAULT_MQTT_PORT         = 1883;
+const std::string SUA_DEFAULT_MQTT_SERVER       = "tcp://mosquitto:1883";
+const std::string SUA_DEFAULT_MODE              = "download";
+const std::string SUA_DEFAULT_TEMP_DIRECTORY    = "/data/selfupdates";
+const std::string SUA_DEFAULT_CA_DIRECTORY      = "/etc/ssl/certs";
+const std::string SUA_DEFAULT_CA_FILEPATH       = "";
+const int         SUA_DEFAULT_FEEDBACK_INTERVAL = 5;
diff --git a/src/Defaults.h b/src/Defaults.h
@@ -27,6 +27,6 @@ extern const std::string SUA_DEFAULT_MODE;
 extern const std::string SUA_DEFAULT_TEMP_DIRECTORY;
 extern const std::string SUA_DEFAULT_CA_DIRECTORY;
 extern const std::string SUA_DEFAULT_CA_FILEPATH;
-extern const int         SUA_DEFAULT_MESSAGE_DELAY;
+extern const int         SUA_DEFAULT_FEEDBACK_INTERVAL; // seconds
 
 #endif
diff --git a/src/FSM/States/Downloading.cpp b/src/FSM/States/Downloading.cpp
@@ -56,9 +56,9 @@ namespace sua {
 
             Logger::info("Download progress: {}%", ctx.desiredState.downloadProgressPercentage);
 
-            if(now_in_seconds - _last_update > ctx.messageDelay) {
+            if((ctx.desiredState.downloadProgressPercentage == 100) || (now_in_seconds - _timeLastUpdate) >= ctx.feedbackInterval) {
                 send(ctx, IMqttProcessor::TOPIC_FEEDBACK, MqttMessage::Downloading);
-                _last_update = now_in_seconds;
+                _timeLastUpdate = now_in_seconds;
             }
         });
 

diff --git a/src/FSM/States/Downloading.h b/src/FSM/States/Downloading.h
@@ -34,7 +34,7 @@ namespace sua {
         FotaEvent body(Context& ctx) override;
 
     private:
-        long long _last_update = 0;
+        long long _timeLastUpdate = 0;
     };
 
 } // namespace sua

diff --git a/src/FSM/States/Installing.cpp b/src/FSM/States/Installing.cpp
@@ -21,6 +21,8 @@
 #include "Context.h"
 #include "Logger.h"
 
+#include <chrono>
+
 namespace sua {
 
     Installing::Installing()
@@ -41,9 +43,9 @@ namespace sua {
             const auto now            = std::chrono::system_clock::now().time_since_epoch();
             const auto now_in_seconds = std::chrono::duration_cast<std::chrono::seconds>(now).count();
 
-            if(now_in_seconds - _last_update > ctx.messageDelay) {
+            if((ctx.desiredState.installProgressPercentage == 100) || (now_in_seconds - _timeLastUpdate) >= ctx.feedbackInterval) {
                 send(ctx, IMqttProcessor::TOPIC_FEEDBACK, MqttMessage::Installing);
-                _last_update = now_in_seconds;
+                _timeLastUpdate = now_in_seconds;
             }
         });
 

diff --git a/src/FSM/States/Installing.h b/src/FSM/States/Installing.h
@@ -34,7 +34,7 @@ namespace sua {
         FotaEvent body(Context& ctx) override;
 
     private:
-        long long _last_update = 0;
+        long long _timeLastUpdate = 0;
     };
 
 } // namespace sua

diff --git a/src/main.cpp b/src/main.cpp
@@ -68,16 +68,16 @@ int main(int argc, char* argv[])
     std::string caDirectory             = SUA_DEFAULT_CA_DIRECTORY;
     std::string caFilepath              = SUA_DEFAULT_CA_FILEPATH;
     std::string help_string             = fmt::format(help_string_template, server, installer, hostPathToSelfupdateDir, server, caDirectory, caFilepath);
-    int         messageDelay            = SUA_DEFAULT_MESSAGE_DELAY;
+    int         feedbackInterval        = SUA_DEFAULT_FEEDBACK_INTERVAL;
 
     const char * env_server = std::getenv("SUA_SERVER");
     if(env_server) {
         server = env_server;
     }
 
-    const char * env_delay = std::getenv("SUA_MESSAGE_DELAY");
-    if(env_delay) {
-        messageDelay = std::stoi(env_delay);
+    const char * env_interval = std::getenv("SUA_MESSAGE_DELAY");
+    if(env_interval) {
+        feedbackInterval = std::stoi(env_interval);
     }
 
     if(argc > 1) {
@@ -229,7 +229,7 @@ int main(int argc, char* argv[])
     ctx.messagingProtocol = std::make_shared<sua::MqttMessagingProtocolJSON>();
     ctx.bundleChecker     = std::make_shared<sua::BundleChecker>();
     ctx.mqttProcessor     = std::make_shared<sua::MqttProcessor>(ctx);
-    ctx.messageDelay      = messageDelay;
+    ctx.feedbackInterval  = feedbackInterval;
 
     sua::Logger::info("SUA build number       : '{}'", SUA_BUILD_NUMBER );
     sua::Logger::info("SUA commit hash        : '{}'", SUA_COMMIT_HASH  );