Merge pull request #86 from boostorg/83-fix-reconnect-loop-in-the-subscriber-example

83 fix reconnect loop in the subscriber example

Author: mzimbres

CMakeLists.txt

@@ -59,9 +59,9 @@ include_directories(include)
 #=======================================================================
 
 add_library(common STATIC
-   examples/common/common.cpp
-   examples/common/main.cpp
-   examples/common/boost_redis.cpp
+   examples/start.cpp
+   examples/main.cpp
+   examples/boost_redis.cpp
 )
 target_compile_features(common PUBLIC cxx_std_20)
 if (MSVC)
@@ -98,12 +98,10 @@ if (MSVC)
     target_compile_definitions(cpp17_intro PRIVATE _WIN32_WINNT=0x0601)
 endif()
 
+if (NOT MSVC)
 add_executable(cpp17_intro_sync examples/cpp17_intro_sync.cpp)
 target_compile_features(cpp17_intro_sync PUBLIC cxx_std_17)
 add_test(cpp17_intro_sync cpp17_intro_sync)
-if (MSVC)
-    target_compile_options(cpp17_intro_sync PRIVATE /bigobj)
-    target_compile_definitions(cpp17_intro_sync PRIVATE _WIN32_WINNT=0x0601)
 endif()
 
 if (NOT MSVC)
@@ -320,6 +318,14 @@ target_link_libraries(test_conn_check_health common)
 add_test(test_conn_check_health test_conn_check_health)
 endif()
 
+add_executable(test_run tests/run.cpp)
+target_compile_features(test_run PUBLIC cxx_std_17)
+add_test(test_run test_run)
+if (MSVC)
+    target_compile_options(test_run PRIVATE /bigobj)
+    target_compile_definitions(test_run PRIVATE _WIN32_WINNT=0x0601)
+endif()
+
 # Install
 #=======================================================================
 

CMakePresets.json

@@ -40,37 +40,37 @@
       }
     },
     {
-      "name": "g++-11-cpp17",
+      "name": "g++-11",
       "generator": "Unix Makefiles",
       "hidden": false,
       "inherits": ["cmake-pedantic"],
-      "binaryDir": "${sourceDir}/build/g++-11-cpp17",
+      "binaryDir": "${sourceDir}/build/g++-11",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_CXX_EXTENSIONS": "OFF",
         "CMAKE_CXX_FLAGS": "-Wall -Wextra -fsanitize=address",
         "CMAKE_CXX_COMPILER": "g++-11",
         "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address",
         "CMAKE_CXX_STANDARD_REQUIRED": "ON",
-        "PROJECT_BINARY_DIR": "${sourceDir}/build/g++-11-cpp17",
-        "DOXYGEN_OUTPUT_DIRECTORY": "${sourceDir}/build/g++-11-cpp17/doc/"
+        "PROJECT_BINARY_DIR": "${sourceDir}/build/g++-11",
+        "DOXYGEN_OUTPUT_DIRECTORY": "${sourceDir}/build/g++-11/doc/"
       }
     },
     {
-      "name": "g++-11-cpp20",
+      "name": "clang++-13",
       "generator": "Unix Makefiles",
       "hidden": false,
       "inherits": ["cmake-pedantic"],
-      "binaryDir": "${sourceDir}/build/g++-11-cpp20",
+      "binaryDir": "${sourceDir}/build/clang++-13",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_CXX_EXTENSIONS": "OFF",
         "CMAKE_CXX_FLAGS": "-Wall -Wextra -fsanitize=address",
         "CMAKE_CXX_COMPILER": "g++-11",
         "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address",
         "CMAKE_CXX_STANDARD_REQUIRED": "ON",
-        "PROJECT_BINARY_DIR": "${sourceDir}/build/g++-11-cpp20",
-        "DOXYGEN_OUTPUT_DIRECTORY": "${sourceDir}/build/g++-11-cpp20/doc/"
+        "PROJECT_BINARY_DIR": "${sourceDir}/build/clang++-13",
+        "DOXYGEN_OUTPUT_DIRECTORY": "${sourceDir}/build/clang++-13/doc/"
       }
     },
     {
@@ -113,7 +113,7 @@
       "name": "clang-tidy",
       "generator": "Unix Makefiles",
       "hidden": false,
-      "inherits": ["g++-11-cpp17"],
+      "inherits": ["g++-11"],
       "binaryDir": "${sourceDir}/build/clang-tidy",
       "cacheVariables": {
         "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--header-filter=${sourceDir}/include/*",
@@ -123,8 +123,8 @@
   ],
   "buildPresets": [
      { "name": "coverage", "configurePreset": "coverage" },
-     { "name": "g++-11-cpp17", "configurePreset": "g++-11-cpp17" },
-     { "name": "g++-11-cpp20", "configurePreset": "g++-11-cpp20" },
+     { "name": "g++-11", "configurePreset": "g++-11" },
+     { "name": "clang++-13", "configurePreset": "clang++-13" },
      { "name": "libc++-14-cpp17", "configurePreset": "libc++-14-cpp17" },
      { "name": "libc++-14-cpp20", "configurePreset": "libc++-14-cpp20" },
      { "name": "clang-tidy", "configurePreset": "clang-tidy" }
@@ -136,10 +136,11 @@
        "output": {"outputOnFailure": true},
        "execution": {"noTestsAction": "error", "stopOnFailure": true}
      },
-     { "name": "coverage",         "configurePreset": "coverage",         "inherits": ["test"] },
-     { "name": "g++-11-cpp17",   "configurePreset": "g++-11-cpp17",   "inherits": ["test"] },
-     { "name": "libc++-14-cpp17",  "configurePreset": "libc++-14-cpp17",  "inherits": ["test"] },
-     { "name": "libc++-14-cpp20",  "configurePreset": "libc++-14-cpp20",  "inherits": ["test"] },
-     { "name": "clang-tidy",       "configurePreset": "clang-tidy",       "inherits": ["test"] }
+     { "name": "coverage",        "configurePreset": "coverage",         "inherits": ["test"] },
+     { "name": "g++-11",          "configurePreset": "g++-11",           "inherits": ["test"] },
+     { "name": "clang++-13",      "configurePreset": "clang++-13",       "inherits": ["test"] },
+     { "name": "libc++-14-cpp17", "configurePreset": "libc++-14-cpp17",  "inherits": ["test"] },
+     { "name": "libc++-14-cpp20", "configurePreset": "libc++-14-cpp20",  "inherits": ["test"] },
+     { "name": "clang-tidy",      "configurePreset": "clang-tidy",       "inherits": ["test"] }
   ]
 }

README.md

@@ -527,7 +527,7 @@ void boost_redis_from_bulk(mystruct& obj, char const* p, std::size_t size, boost
 
 These functions are accessed over ADL and therefore they must be
 imported in the global namespace by the user.  In the
-[Examples](#Examples) section the reader can find examples showing how
+[Examples](#examples) section the reader can find examples showing how
 to serialize using json and [protobuf](https://protobuf.dev/).
 
 <a name="examples"></a>
@@ -831,6 +831,9 @@ https://lists.boost.org/Archives/boost/2023/01/253944.php.
 * Adds a function that performs health checks, see
   `boost::redis::experimental::async_check_health`.
 
+* Adds non-member `async_run` function that resolves, connects and
+  calls member `async_run` on a connection object.
+
 ### v1.4.0-1
 
 * Renames `retry_on_connection_lost` to `cancel_if_unresponded`.  (v1.4.1)

examples/common/boost_redis.cpp renamed to examples/boost_redis.cpp

@@ -5,98 +5,56 @@
  */
 
 #include <iostream>
-#include <boost/asio.hpp>
-#include <boost/redis.hpp>
+#include <boost/redis/run.hpp>
+#include <boost/redis/address.hpp>
 #include <boost/redis/src.hpp>
 
 namespace net = boost::asio;
-namespace redis = boost::redis;
-using redis::operation;
-using redis::request;
-using redis::response;
-using redis::ignore_t;
-
-void log(boost::system::error_code const& ec, char const* prefix)
-{
-   std::clog << prefix << ec.message() << std::endl;
-}
+using boost::redis::connection;
+using boost::redis::request;
+using boost::redis::response;
+using boost::redis::ignore_t;
+using boost::redis::async_run;
+using boost::redis::address;
+using namespace std::chrono_literals;
 
 auto main(int argc, char * argv[]) -> int
 {
    try {
-      std::string host = "127.0.0.1";
-      std::string port = "6379";
+      address addr;
 
       if (argc == 3) {
-         host = argv[1];
-         port = argv[2];
+         addr.host = argv[1];
+         addr.port = argv[2];
       }
 
       // The request
       request req;
       req.push("HELLO", 3);
       req.push("PING", "Hello world");
-      req.push("QUIT");
 
       // The response.
-      response<ignore_t, std::string, ignore_t> resp;
+      response<ignore_t, std::string> resp;
 
       net::io_context ioc;
+      connection conn{ioc};
 
-      // IO objects.
-      net::ip::tcp::resolver resv{ioc};
-      redis::connection conn{ioc};
-
-      // Resolve endpoints.
-      net::ip::tcp::resolver::results_type endpoints;
-
-      // async_run callback.
-      auto on_run = [](auto ec)
-      {
-         if (ec)
-            return log(ec, "on_run: ");
-      };
-
-      // async_exec callback.
-      auto on_exec = [&](auto ec, auto)
-      {
-         if (ec) {
-            conn.cancel(operation::run);
-            return log(ec, "on_exec: ");
-         }
+      async_run(conn, addr, 10s, 10s, [&](auto){
+         conn.cancel();
+      });
 
-         std::cout << "PING: " << std::get<1>(resp).value() << std::endl;
-      };
-
-      // Connect callback.
-      auto on_connect = [&](auto ec, auto)
-      {
-         if (ec)
-            return log(ec, "on_connect: ");
-
-         conn.async_run(on_run);
-         conn.async_exec(req, resp, on_exec);
-      };
-
-      // Resolve callback.
-      auto on_resolve = [&](auto ec, auto const& addrs)
-      {
-         if (ec)
-            return log(ec, "on_resolve: ");
-
-         endpoints = addrs;
-         net::async_connect(conn.next_layer(), endpoints, on_connect);
-      };
-
-      resv.async_resolve(host, port, on_resolve);
+      conn.async_exec(req, resp, [&](auto ec, auto){
+         if (!ec)
+            std::cout << "PING: " << std::get<1>(resp).value() << std::endl;
+         conn.cancel();
+      });
 
       ioc.run();
       return 0;
 
    } catch (std::exception const& e) {
       std::cerr << "Error: " << e.what() << std::endl;
    }
-
    return 1;
 }