Fixed regression with boost 1.86

jgaa · Aug 27, 2024 · 73cc971 · 73cc971
1 parent 6a9839b
commit 73cc971
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.24)
 
 if (NOT DEFINED MYSQLPOOL_VERSION)
-    set(MYSQLPOOL_VERSION 0.4.0)
+    set(MYSQLPOOL_VERSION 0.4.1)
 endif()
 
 project(mysqlpool-cpp

diff --git a/src/mysqlpool.cpp b/src/mysqlpool.cpp
@@ -80,10 +80,14 @@ asio::awaitable<Mysqlpool::Handle> Mysqlpool::getConnection(const Options& opts)
 
 
         MYSQLPOOL_LOG_TRACE_("Waiting for a DB connection to become available...");
-        const auto [ec] = co_await semaphore_.async_wait(as_tuple(asio::use_awaitable));
-        if (ec != boost::asio::error::operation_aborted) {
-            MYSQLPOOL_LOG_DEBUG_("async_wait on semaphore failed: " << ec.message());
+        try {
+            co_await semaphore_.async_wait(as_tuple(asio::use_awaitable));
+        } catch(const boost::system::system_error& ec) {
+            if (ec.code() != boost::asio::error::operation_aborted) {
+                MYSQLPOOL_LOG_DEBUG_("async_wait on semaphore failed: " << ec.what());
+            }
         }
+
         MYSQLPOOL_LOG_TRACE_("Done waiting");
     }