From f8f5ccfd2cb5451fcb7583b2ef3dbe968382194b Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Mon, 29 Sep 2025 11:43:55 -0500
Subject: [PATCH] refactor

---
 repertory/librepertory/src/comm/packet/common.cpp   |  2 +-
 .../librepertory/src/comm/packet/packet_client.cpp  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/repertory/librepertory/src/comm/packet/common.cpp b/repertory/librepertory/src/comm/packet/common.cpp
index 3b15476d..ad3709f5 100644
--- a/repertory/librepertory/src/comm/packet/common.cpp
+++ b/repertory/librepertory/src/comm/packet/common.cpp
@@ -34,7 +34,7 @@ non_blocking_guard::~non_blocking_guard() {
   }
 
   boost::system::error_code err;
-  [[maybe_unused]] auto ret = sock.non_blocking(non_blocking, err);
+  [[maybe_unused]] auto res = sock.non_blocking(non_blocking, err);
 }
 
 auto is_socket_still_alive(boost::asio::ip::tcp::socket &sock) -> bool {
diff --git a/repertory/librepertory/src/comm/packet/packet_client.cpp b/repertory/librepertory/src/comm/packet/packet_client.cpp
index de47627e..d244667f 100644
--- a/repertory/librepertory/src/comm/packet/packet_client.cpp
+++ b/repertory/librepertory/src/comm/packet/packet_client.cpp
@@ -308,6 +308,12 @@ auto packet_client::send(std::string_view method, packet &request,
   for (std::uint8_t retry = 1U;
        allow_connections_ && not success && (retry <= max_read_attempts);
        ++retry) {
+    const auto retry_after_sleep = [&]() {
+      if (allow_connections_ && (retry < max_read_attempts)) {
+        std::this_thread::sleep_for(1s);
+      }
+    };
+
     auto current_client = get_client();
     if (current_client) {
       try {
@@ -333,16 +339,17 @@ auto packet_client::send(std::string_view method, packet &request,
               ret = res;
               success = true;
               put_client(current_client);
+              continue;
             }
           }
         }
       } catch (const std::exception &e) {
         utils::error::raise_error(function_name, e, "send failed");
         close(*current_client);
-        if (allow_connections_ && (retry < max_read_attempts)) {
-          std::this_thread::sleep_for(1s);
-        }
+        retry_after_sleep();
       }
+    } else {
+      retry_after_sleep();
     }
 
     if (not allow_connections_) {