unclean shutdown works

cwaldren-ld · cwaldren-ld · commit a1473e661ee4 · 2024-04-03T13:02:35.000-07:00
diff --git a/libs/client-sdk/src/client_impl.cpp b/libs/client-sdk/src/client_impl.cpp
@@ -149,18 +149,14 @@ std::future<bool> ClientImpl::IdentifyAsync(Context context) {
 }
 
 void ClientImpl::RestartDataSource() {
-    if (data_source_) {
-        auto then = std::chrono::steady_clock::now();
-        data_source_->ShutdownAsync([then]() {
-            std::cout << "Shutdown in "
-                      << std::chrono::duration_cast<std::chrono::milliseconds>(
-                             std::chrono::steady_clock::now() - then)
-                             .count()
-                      << "ms" << std::endl;
-        });
+    auto start_op = [this]() {
+        data_source_ = data_source_factory_();
+        data_source_->Start();
+    };
+    if (!data_source_) {
+        return start_op();
     }
-    data_source_ = data_source_factory_();
-    data_source_->Start();
+    data_source_->ShutdownAsync(start_op);
 }
 
 std::future<bool> ClientImpl::StartAsyncInternal(
@@ -174,7 +170,7 @@ std::future<bool> ClientImpl::StartAsyncInternal(
             if (auto const state = status.State(); IsInitialized(state)) {
                 init_promise->set_value(result(status.State()));
                 return true; /* delete this change listener since the desired
-                        state was reached */
+                                state was reached */
             }
             return false; /* keep the change listener */
         });
diff --git a/libs/client-sdk/src/data_sources/streaming_data_source.cpp b/libs/client-sdk/src/data_sources/streaming_data_source.cpp
@@ -12,7 +12,6 @@
 #include <boost/json.hpp>
 #include <boost/url.hpp>
 
-#include <iostream>
 #include <utility>
 
 namespace launchdarkly::client_side::data_sources {
diff --git a/libs/server-sent-events/src/client.cpp b/libs/server-sent-events/src/client.cpp
@@ -58,7 +58,6 @@ class FoxyClient : public Client,
     using cb = std::function<void(launchdarkly::sse::Event)>;
     using body = launchdarkly::sse::detail::EventBody<cb>;
     using response = http::response<body>;
-    int count;
 
    public:
     FoxyClient(boost::asio::any_io_executor executor,
@@ -91,8 +90,7 @@ class FoxyClient : public Client,
               kDefaultMaxBackoffDelay),
           backoff_timer_(std::move(executor)),
           last_read_(std::nullopt),
-          shutting_down_(false),
-          count(get_counter()) {
+          shutting_down_(false) {
         create_session();
         create_parser();
     }
@@ -282,17 +280,10 @@ class FoxyClient : public Client,
     void on_read_body(boost::system::error_code ec, std::size_t amount) {
         boost::ignore_unused(amount);
         if (ec) {
+            if (shutting_down_) {
+                return;
+            }
             if (ec == boost::asio::error::operation_aborted) {
-                // operation_aborted can occur if the read timeout is reached or
-                // if we're shutting down, so shutting_down_ is needed to
-                // disambiguate.
-                if (shutting_down_) {
-                    boost::system::error_code ec = {};
-                    session_->stream.plain().shutdown(
-                        boost::asio::ip::tcp::socket::shutdown_both, ec);
-                    session_->stream.plain().close(ec);
-                    return;
-                }
                 errors_(Error::ReadTimeout);
                 return async_backoff(
                     "aborting read of response body (timeout)");
@@ -344,18 +335,17 @@ class FoxyClient : public Client,
     }
 
     void do_shutdown(std::function<void()> completion) {
+        // Signal to the body reader operation that if it completes,
+        // it should return instead of starting another async read.
         shutting_down_ = true;
+        // If any backoff is taking place, cancel that as well.
         backoff_timer_.cancel();
-        if (session_->stream.is_ssl()) {
-            session_->stream.ssl().next_layer().cancel();
-        } else {
-            session_->stream.plain().cancel();
-        }
-    }
+        
+        boost::system::error_code ec = {};
+        session_->stream.plain().shutdown(
+            boost::asio::ip::tcp::socket::shutdown_both, ec);
+        session_->stream.plain().close(ec);
 
-    void on_shutdown(std::function<void()> completion,
-                     boost::system::error_code ec) {
-        boost::ignore_unused(ec);
         if (completion) {
             completion();
         }
