Skip to content

feat(*): Log progress messages to stderr even when using json output on stdout #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eric-wieser wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(*): Log progress messages to stderr even when using json output on stdout #495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/shell/lean.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class progress_message_stream {
mutex m_mutex;
bool m_showing_task = false;
std::ostream & m_out;
bool m_use_json;
std::ostream * m_json_out;
log_tree::node m_lt;

bool m_show_progress;
Expand All @@ -333,8 +333,8 @@ class progress_message_stream {
}

public:
progress_message_stream(std::ostream & out, bool use_json, bool show_progress, log_tree::node const & lt) :
m_out(out), m_use_json(use_json), m_lt(lt), m_show_progress(show_progress) {
progress_message_stream(std::ostream & out, std::ostream * json_out, bool show_progress, log_tree::node const & lt) :
m_out(out), m_json_out(json_out), m_lt(lt), m_show_progress(show_progress) {
#if defined(LEAN_MULTI_THREAD)
if (show_progress) {
m_timer.reset(new single_timer);
Expand All @@ -355,9 +355,9 @@ class progress_message_stream {
if (auto msg = dynamic_cast<message const *>(e.m_entry.get())) {
unique_lock<mutex> lock(m_mutex);
clear_shown_task();
if (m_use_json) {
if (m_json_out) {
#if defined(LEAN_JSON)
print_json(m_out, *msg);
print_json(*m_json_out, *msg);
#endif
} else {
m_out << *msg;
Expand Down Expand Up @@ -404,7 +404,6 @@ class progress_message_stream {
show_current_task_core();
}
void show_current_task_core() {
if (m_use_json) return;
if (auto desc = find_current_task()) {
if (*desc == m_last_task && m_showing_task) return;
m_last_task = *desc;
Expand Down Expand Up @@ -600,8 +599,8 @@ int main(int argc, char ** argv) {
log_tree lt;

bool show_progress = make_mode && isatty(STDOUT_FILENO);
progress_message_stream msg_stream(std::cout, json_output, show_progress, lt.get_root());
if (json_output) ios.set_regular_channel(ios.get_diagnostic_channel_ptr());
progress_message_stream msg_stream(ios.get_regular_stream(), json_output ? &std::cout : nullptr, show_progress, lt.get_root());

if (!test_suite)
lt.add_listener([&] (std::vector<log_tree::event> const & evs) { msg_stream.on_event(evs); });
Expand Down