From 3f305cecc3dd165d7c2d4d0224bbceddb0c4dfb3 Mon Sep 17 00:00:00 2001 From: Alexander Kuzmenkov Date: Wed, 27 Jan 2021 22:52:18 +0300 Subject: [PATCH 1/2] add empty line after error messages in client --- programs/client/Client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp index 06bd7d84526..ef12974adea 100644 --- a/programs/client/Client.cpp +++ b/programs/client/Client.cpp @@ -931,13 +931,13 @@ private: } std::cerr << "Received exception from server (version " << server_version << "):" << std::endl << "Code: " - << server_exception->code() << ". " << text << std::endl; + << server_exception->code() << ". " << text << std::endl << std::endl; } if (client_exception) { fmt::print(stderr, - "Error on processing query '{}':\n{}\n", + "Error on processing query '{}':\n{}\n\n", full_query, client_exception->message()); } From d72b302b9790b56036201a6a424660b713b67828 Mon Sep 17 00:00:00 2001 From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com> Date: Thu, 28 Jan 2021 23:16:35 +0300 Subject: [PATCH 2/2] Update Client.cpp --- programs/client/Client.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp index ef12974adea..9a8b580407a 100644 --- a/programs/client/Client.cpp +++ b/programs/client/Client.cpp @@ -931,14 +931,22 @@ private: } std::cerr << "Received exception from server (version " << server_version << "):" << std::endl << "Code: " - << server_exception->code() << ". " << text << std::endl << std::endl; + << server_exception->code() << ". " << text << std::endl; + if (is_interactive) + { + std::cerr << std::endl; + } } if (client_exception) { fmt::print(stderr, - "Error on processing query '{}':\n{}\n\n", + "Error on processing query '{}':\n{}\n", full_query, client_exception->message()); + if (is_interactive) + { + fmt::print(stderr, "\n"); + } } // A debug check -- at least some exception must be set, if the error