Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit 7bdf626

Browse files
committed
fix(config): Regression fixed with a backport.
1 parent 8d7afc6 commit 7bdf626

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
### Bugfixes
88

9+
*Config*
10+
11+
retry_interval attribute in configuration file seems to be have a safe behavior with a
12+
decimal value, but but with a chain of character broker quit without understanble error message,
13+
now broker quits cleanly with a warning that we can see in by using journalctl command.
14+
915

1016
*TCP*
1117

@@ -38,14 +44,17 @@ Now '.' is allowed in names.
3844
When broker is badly configured and the user wants to stop it, it may hang and
3945
never stop. This new version fixes this issue.
4046

47+
There were also dangling pointers in the bbdo manager that regularly lead to
48+
segfault when it was unloaded. It is fixed now.
49+
4150
*Storage rebuilder*
4251

4352
The rebuilder loop has been rewritten. When it is stopped, it is interrupted
4453
correctly.
4554

4655
*Logs*
4756

48-
The new logs (log_v2) are correctly flushed when cbd is stopped.
57+
The new logs (log\_v2) are correctly flushed when cbd is stopped.
4958

5059
*Thread pool*
5160

core/src/bbdo/stream.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static uint32_t set_uint(io::data& t,
183183
}
184184

185185
/**
186-
* Set an uint32_teger within an object.
186+
* Set an uint64_teger within an object.
187187
*/
188188
static uint32_t set_ulong(io::data& t,
189189
mapping::entry const& member,

core/src/compression/stream.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool stream::read(std::shared_ptr<io::data>& data, time_t deadline) {
7373
// Process buffer as long as data is corrupted
7474
// or until an exception occurs.
7575
bool corrupted(true);
76-
int size(0);
76+
size_t size(0);
7777
int skipped(0);
7878
while (corrupted) {
7979
// Get compressed data length.

core/src/config/parser.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,8 @@ void parser::_parse_endpoint(Json const& elem, endpoint& e) {
252252
e.retry_interval =
253253
static_cast<uint32_t>(std::stoul(object.second.string_value()));
254254
} catch (const std::exception& e) {
255-
throw msg_fmt(
256-
"config parser: cannot parse key "
257-
"'retry_interval': value must be an integer");
255+
throw exceptions::msg() << "config parser: cannot parse key "
256+
"'retry_interval': value must be an integer";
258257
}
259258
else if (object.first == "filters") {
260259
std::set<std::string> endpoint::*member;

0 commit comments

Comments
 (0)