Skip to content

Commit 8df535f

Browse files
authored
Merge pull request #221 from boostorg/develop
Fixes for Boost 1.87
2 parents 943cf0d + 26197e8 commit 8df535f

File tree

8 files changed

+25
-69
lines changed

8 files changed

+25
-69
lines changed

.github/workflows/coverage.yml

-51
This file was deleted.

CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ if (BOOST_REDIS_MAIN_PROJECT)
3838
align
3939
context
4040
core
41-
coroutine
4241
static_assert
4342
pool
4443
date_time

README.md

+14-7
Original file line numberDiff line numberDiff line change
@@ -678,42 +678,49 @@ https://lists.boost.org/Archives/boost/2023/01/253944.php.
678678

679679
### Boost 1.87
680680

681-
* ([Issue 205](https://github.com/boostorg/redis/issues/205))
681+
* (Issue [205](https://github.com/boostorg/redis/issues/205))
682682
Improves reaction time to disconnection by using `wait_for_one_error`
683683
instead of `wait_for_all`. The function `connection::async_run` was
684684
also changed to return EOF to the user when that error is received
685685
from the server. That is a breaking change.
686686

687-
* ([Issue 210](https://github.com/boostorg/redis/issues/210))
687+
* (Issue [210](https://github.com/boostorg/redis/issues/210))
688688
Fixes the adapter of empty nested reposponses.
689689

690+
* (Issues [211](https://github.com/boostorg/redis/issues/211) and [212](https://github.com/boostorg/redis/issues/212))
691+
Fixes the reconnect loop that would hang under certain conditions,
692+
see the linked issues for more details.
693+
694+
* (Issue [219](https://github.com/boostorg/redis/issues/219))
695+
Changes the default log level from `disabled` to `debug`.
696+
690697
### Boost 1.85
691698

692-
* ([Issue 170](https://github.com/boostorg/redis/issues/170))
699+
* (Issue [170](https://github.com/boostorg/redis/issues/170))
693700
Under load and on low-latency networks it is possible to start
694701
receiving responses before the write operation completed and while
695702
the request is still marked as staged and not written. This messes
696703
up with the heuristics that classifies responses as unsolicied or
697704
not.
698705

699-
* ([Issue 168](https://github.com/boostorg/redis/issues/168)).
706+
* (Issue [168](https://github.com/boostorg/redis/issues/168)).
700707
Provides a way of passing a custom SSL context to the connection.
701708
The design here differs from that of Boost.Beast and Boost.MySql
702709
since in Boost.Redis the connection owns the context instead of only
703710
storing a reference to a user provided one. This is ok so because
704711
apps need only one connection for their entire application, which
705712
makes the overhead of one ssl-context per connection negligible.
706713

707-
* ([Issue 181](https://github.com/boostorg/redis/issues/181)).
714+
* (Issue [181](https://github.com/boostorg/redis/issues/181)).
708715
See a detailed description of this bug in
709716
[this](https://github.com/boostorg/redis/issues/181#issuecomment-1913346983)
710717
comment.
711718

712-
* ([Issue 182](https://github.com/boostorg/redis/issues/182)).
719+
* (Issue [182](https://github.com/boostorg/redis/issues/182)).
713720
Sets `"default"` as the default value of `config::username`. This
714721
makes it simpler to use the `requirepass` configuration in Redis.
715722

716-
* ([Issue 189](https://github.com/boostorg/redis/issues/189)).
723+
* (Issue [189](https://github.com/boostorg/redis/issues/189)).
717724
Fixes narrowing convertion by using `std::size_t` instead of
718725
`std::uint64_t` for the sizes of bulks and aggregates. The code
719726
relies now on `std::from_chars` returning an error if a value

include/boost/redis/detail/connector.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ struct connect_op {
4242
ctor_->endpoint_ = ep;
4343

4444
if (ec == asio::error::operation_aborted) {
45-
ec == error::connect_timeout;
45+
self.complete(redis::error::connect_timeout);
46+
} else {
47+
self.complete(ec);
4648
}
47-
48-
self.complete(ec);
4949
}
5050
}
5151
};

include/boost/redis/detail/resolver.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ struct resolve_op {
4141
resv_->results_ = res;
4242

4343
if (ec == asio::error::operation_aborted) {
44-
ec == error::resolve_timeout;
44+
self.complete(error::resolve_timeout);
45+
} else {
46+
self.complete(ec);
4547
}
46-
self.complete(ec);
4748
}
4849
}
4950
};

include/boost/redis/logger.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class logger {
6464
*
6565
* @param l Log level.
6666
*/
67-
logger(level l = level::disabled)
67+
logger(level l = level::debug)
6868
: level_{l}
6969
{}
7070

test/test_conn_push.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <boost/system/errc.hpp>
1010
#include <boost/asio/detached.hpp>
1111
#include <boost/asio/co_spawn.hpp>
12-
#include <boost/asio/experimental/as_tuple.hpp>
12+
#include <boost/asio/as_tuple.hpp>
1313
#define BOOST_TEST_MODULE conn-push
1414
#include <boost/test/included/unit_test.hpp>
1515
#include <iostream>
@@ -21,7 +21,7 @@ namespace redis = boost::redis;
2121
using boost::redis::operation;
2222
using connection = boost::redis::connection;
2323
using error_code = boost::system::error_code;
24-
using net::experimental::as_tuple;
24+
using net::as_tuple;
2525
using boost::redis::request;
2626
using boost::redis::response;
2727
using boost::redis::ignore;

test/test_conn_run_cancel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
#ifdef BOOST_ASIO_HAS_CO_AWAIT
1717
#include <boost/asio/experimental/awaitable_operators.hpp>
18-
#include <boost/asio/experimental/as_tuple.hpp>
18+
#include <boost/asio/as_tuple.hpp>
1919

2020
namespace net = boost::asio;
2121

2222
using boost::redis::operation;
2323
using boost::redis::connection;
2424
using boost::system::error_code;
25-
using net::experimental::as_tuple;
25+
using net::as_tuple;
2626
using boost::redis::request;
2727
using boost::redis::response;
2828
using boost::redis::ignore;

0 commit comments

Comments
 (0)