Fixed an infinite loop when refreshing the snode cache

Author: mpretty-cyro

include/session/network.hpp

@@ -217,8 +217,8 @@ class Network {
     std::unordered_map<std::string, std::pair<swarm_id_t, std::vector<service_node>>> swarm_cache;
 
     // Snode refresh state
-    int snode_cache_refresh_failure_count;
-    int in_progress_snode_cache_refresh_count;
+    int snode_cache_refresh_failure_count = 0;
+    int in_progress_snode_cache_refresh_count = 0;
     std::optional<std::string> current_snode_cache_refresh_request_id;
     std::vector<std::function<void()>> after_snode_cache_refresh;
     std::optional<std::vector<service_node>> unused_snode_refresh_nodes;

src/network.cpp

@@ -1207,6 +1207,8 @@ void Network::refresh_snode_cache(std::optional<std::string> existing_request_id
     // `snode_refresh_results` so we can use it to track the results from the different requests)
     if (!current_snode_cache_refresh_request_id) {
         log::info(cat, "Refreshing snode cache ({}).", request_id);
+        snode_cache_refresh_failure_count = 0;
+        in_progress_snode_cache_refresh_count = 0;
         current_snode_cache_refresh_request_id = request_id;
         snode_refresh_results = std::make_shared<std::vector<std::vector<service_node>>>();
     }
@@ -1286,7 +1288,7 @@ void Network::refresh_snode_cache(std::optional<std::string> existing_request_id
                     log::error(
                             cat,
                             "Failed to retrieve nodes from one target when refreshing cache due to "
-                            "error: {} Will try another target after {}ms ({}).",
+                            "error: {}, Will try another target after {}ms ({}).",
                             e.what(),
                             cache_refresh_retry_delay.count(),
                             request_id);