From 82df6d76252e883dfc110ad5ff901aaeea3f51b3 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 20 May 2018 02:56:41 +0300 Subject: [PATCH] Simpler ClientJson::send. GitOrigin-RevId: 5f992052b2ac11385caee32d7dacc799036170cf --- td/telegram/ClientJson.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/td/telegram/ClientJson.cpp b/td/telegram/ClientJson.cpp index f5adc09ec..13dd81c46 100644 --- a/td/telegram/ClientJson.cpp +++ b/td/telegram/ClientJson.cpp @@ -67,13 +67,13 @@ CSlice ClientJson::store_string(std::string str) { } void ClientJson::send(Slice request) { - auto status = [&] { - TRY_RESULT(client_request, to_request(request)); - client_.send(std::move(client_request)); - return Status::OK(); - }(); + auto r_request = to_request(request); + if (r_request.is_error()) { + LOG(ERROR) << "Failed to parse " << tag("request", format::escaped(request)) << " " << r_request.error(); + return; + } - LOG_IF(ERROR, status.is_error()) << "Failed to parse " << tag("request", format::escaped(request)) << " " << status; + client_.send(r_request.move_as_ok()); } CSlice ClientJson::receive(double timeout) {