diff --git a/CHANGES b/CHANGES index 39943c7d57..b3747adeae 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5.2.0-dev.147 | 2022-10-26 11:37:24 +0200 + + * GH-2272: Use `json_escape_utf8` in broker debug output (AmazingPP) + 5.2.0-dev.145 | 2022-10-26 10:51:05 +0200 * Reintroduce event groups. (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 9e05eb2d34..7d91aaaf2c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0-dev.145 +5.2.0-dev.147 diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 447a30e9b7..37e7f9d4c1 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -189,14 +189,19 @@ struct scoped_reporter_location }; #ifdef DEBUG +static std::string RenderMessage(const broker::data& d) + { + return util::json_escape_utf8(broker::to_string(d)); + } + static std::string RenderMessage(std::string topic, const broker::data& x) { - return util::fmt("%s -> %s", broker::to_string(x).c_str(), topic.c_str()); + return util::fmt("%s -> %s", RenderMessage(x).c_str(), topic.c_str()); } static std::string RenderEvent(std::string topic, std::string name, const broker::data& args) { - return util::fmt("%s(%s) -> %s", name.c_str(), broker::to_string(args).c_str(), topic.c_str()); + return util::fmt("%s(%s) -> %s", name.c_str(), RenderMessage(args).c_str(), topic.c_str()); } static std::string RenderMessage(const broker::store::response& x) @@ -210,11 +215,6 @@ static std::string RenderMessage(const broker::vector* xs) return broker::to_string(*xs); } -static std::string RenderMessage(const broker::data& d) - { - return broker::to_string(d); - } - static std::string RenderMessage(const broker::vector& xs) { return broker::to_string(xs);