debug commit; revert me

Author: cwaldren-ld

examples/hello-cpp-client/main.cpp

@@ -62,6 +62,19 @@ int main() {
     std::cout << "*** Feature flag '" << FEATURE_FLAG_KEY << "' is "
               << (flag_value ? "true" : "false") << " for this user\n\n";
 
+    for (int i = 0; i < 5; i++) {
+        auto user_key = "example-user-key-" + std::to_string(i);
+        auto context2 =
+            ContextBuilder().Kind("user", user_key).Name("Bob").Build();
+
+        std::cout << "identifying " << user_key << std::endl;
+        auto fut = client.IdentifyAsync(context2);
+        fut.wait();
+        std::cout << "identified " << user_key << "!" << std::endl;
+
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+    }
+
     return 0;
 }
 

libs/client-sdk/src/client_impl.cpp

@@ -150,7 +150,14 @@ std::future<bool> ClientImpl::IdentifyAsync(Context context) {
 
 void ClientImpl::RestartDataSource() {
     if (data_source_) {
-        data_source_->ShutdownAsync(nullptr);
+        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;
+        });
     }
     data_source_ = data_source_factory_();
     data_source_->Start();

libs/server-sent-events/src/client.cpp

@@ -49,7 +49,7 @@ auto const kDefaultMaxBackoffDelay = std::chrono::seconds(30);
 // we or the server are misbehaving here. In any case, there is no need to wait
 // 5 minutes, we should give a couple seconds to receive a valid response or
 // else stop waiting.
-auto const kShutdownTimeout = std::chrono::seconds(5);
+auto const kShutdownTimeout = std::chrono::seconds(10);
 
 static boost::optional<net::ssl::context&> ToOptRef(
     std::optional<net::ssl::context>& maybe_val) {
@@ -292,8 +292,10 @@ class FoxyClient : public Client,
                 // if we're shutting down, so shutting_down_ is needed to
                 // disambiguate.
                 if (shutting_down_) {
-                    // End the chain of async operations.
-                    return;
+                    session_->opts.timeout = kShutdownTimeout;
+
+                    return session_->async_shutdown(beast::bind_front_handler(
+                        &FoxyClient::on_shutdown, shared_from_this(), []() {}));
                 }
                 errors_(Error::ReadTimeout);
                 return async_backoff(
@@ -337,6 +339,7 @@ class FoxyClient : public Client,
     }
 
     void async_shutdown(std::function<void()> completion) override {
+        std::cout << "shutdown requested, posting..\n";
         // Get on the session's executor, otherwise the code in the completion
         // handler could race.
         boost::asio::post(session_->get_executor(),
@@ -346,15 +349,14 @@ class FoxyClient : public Client,
     }
 
     void do_shutdown(std::function<void()> completion) {
+        std::cout << "shutdown request executing..\n";
         shutting_down_ = true;
         backoff_timer_.cancel();
-        session_->opts.timeout = kShutdownTimeout;
         if (session_->stream.is_ssl()) {
             session_->stream.ssl().next_layer().cancel();
+        } else {
+            session_->stream.plain().cancel();
         }
-        session_->async_shutdown(beast::bind_front_handler(
-            &FoxyClient::on_shutdown, shared_from_this(),
-            std::move(completion)));
     }
 
     void on_shutdown(std::function<void()> completion,

vendor/foxy/include/foxy/impl/client_session/async_shutdown.impl.hpp

@@ -1,8 +1,9 @@
 //
-// Copyright (c) 2018-2019 Christian Mazakas (christian dot mazakas at gmail dot com)
+// Copyright (c) 2018-2019 Christian Mazakas (christian dot mazakas at gmail dot
+// com)
 //
-// Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt
-// or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // Official repository: https://github.com/LeonineKing1199/foxy
 //
@@ -11,39 +12,50 @@
 #define FOXY_IMPL_CLIENT_SESSION_ASYNC_SHUTDOWN_IMPL_HPP_
 
 #include <foxy/client_session.hpp>
-
-namespace launchdarkly::foxy
-{
+#include <iostream>
+namespace launchdarkly::foxy {
 template <class DynamicBuffer>
 template <class ShutdownHandler>
-auto
-basic_client_session<DynamicBuffer>::async_shutdown(ShutdownHandler&& handler) & ->
-  typename boost::asio::async_result<std::decay_t<ShutdownHandler>,
-                                     void(boost::system::error_code)>::return_type
-{
-  return ::launchdarkly::foxy::detail::async_timer<void(boost::system::error_code)>(
-    [self = this, coro = boost::asio::coroutine()](auto& cb, boost::system::error_code ec = {},
-                                                   std::size_t bytes_transferrred = 0) mutable {
-      auto& s = *self;
-
-      BOOST_ASIO_CORO_REENTER(coro)
-      {
-        if (s.stream.is_ssl()) {
-          BOOST_ASIO_CORO_YIELD s.stream.ssl().async_shutdown(std::move(cb));
-          if (ec == boost::asio::ssl::error::stream_truncated) { ec = {}; }
-          if (ec) { goto upcall; }
-        }
-
-        s.stream.plain().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
-        s.stream.plain().close(ec);
-
-      upcall:
-        return cb.complete(ec);
-      }
-    },
-    *this, std::forward<ShutdownHandler>(handler));
+auto basic_client_session<DynamicBuffer>::async_shutdown(
+    ShutdownHandler&& handler) & ->
+    typename boost::asio::async_result<
+        std::decay_t<ShutdownHandler>,
+        void(boost::system::error_code)>::return_type {
+    return ::launchdarkly::foxy::detail::async_timer<void(
+        boost::system::error_code)>(
+        [self = this, coro = boost::asio::coroutine()](
+            auto& cb, boost::system::error_code ec = {},
+            std::size_t bytes_transferrred = 0) mutable {
+            auto& s = *self;
+
+            BOOST_ASIO_CORO_REENTER(coro) {
+                if (s.stream.is_ssl()) {
+                    std::cout << "-> ssl().async_shutdown()\n";
+                    BOOST_ASIO_CORO_YIELD s.stream.ssl().async_shutdown(
+                        std::move(cb));
+                    std::cout << "<- ssl().async_shutdown: " << ec.message()
+                              << '\n';
+                    if (ec == boost::asio::ssl::error::stream_truncated) {
+                        ec = {};
+                    }
+                    if (ec) {
+                        goto upcall;
+                    }
+                }
+
+                std::cout << "plain socket shutdown\n";
+                s.stream.plain().shutdown(
+                    boost::asio::ip::tcp::socket::shutdown_both, ec);
+                s.stream.plain().close(ec);
+
+            upcall:
+                std::cout << "invoke completion handler\n";
+                return cb.complete(ec);
+            }
+        },
+        *this, std::forward<ShutdownHandler>(handler));
 }
 
-} // namespace launchdarkly::foxy
+}  // namespace launchdarkly::foxy
 
-#endif // FOXY_IMPL_CLIENT_SESSION_ASYNC_SHUTDOWN_IMPL_HPP_
+#endif  // FOXY_IMPL_CLIENT_SESSION_ASYNC_SHUTDOWN_IMPL_HPP_