From 2c4449e19af0dc9ab4622439b19ac6b9fc1513a0 Mon Sep 17 00:00:00 2001 From: AmazingPP <1620535041@qq.com> Date: Tue, 2 Aug 2022 21:11:40 +0800 Subject: [PATCH] Use json_escape_utf8 in broker debug output --- src/broker/Manager.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index f3e330056b..cc23c11bad 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);