Skip to content
This repository has been archived by the owner on Jan 2, 2023. It is now read-only.

Write logs to stdout stream instead of stderr #5050

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

Write logs to stdout stream instead of stderr #5050

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/shared/progressfeedback.cc
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ namespace wkhtmltopdf {
void ProgressFeedback::finishLine(int start) {
for (; start < lw; ++start)
fprintf(stderr, " ");
fprintf(stderr, "\n");
fprintf(stdout, "\n");
lw = 0;
fflush(stderr);
}
Expand All @@ -47,7 +47,7 @@ void ProgressFeedback::finishLine(int start) {
*/
void ProgressFeedback::debug(const QString &message) {
if (logLevel < settings::Debug) return;
fprintf(stderr, "Debug: %s",S(message));
fprintf(stdout, "Debug: %s",S(message));
finishLine(7 + message.size());
}

Expand All @@ -57,7 +57,7 @@ void ProgressFeedback::debug(const QString &message) {
*/
void ProgressFeedback::info(const QString &message) {
if (logLevel < settings::Info) return;
fprintf(stderr, "Info: %s",S(message));
fprintf(stdout, "Info: %s",S(message));
finishLine(6 + message.size());
}

Expand All @@ -67,7 +67,7 @@ void ProgressFeedback::info(const QString &message) {
*/
void ProgressFeedback::warning(const QString &message) {
if (logLevel < settings::Warn) return;
fprintf(stderr, "Warning: %s",S(message));
fprintf(stdout, "Warning: %s",S(message));
finishLine(9 + message.size());
}

Expand All @@ -87,39 +87,39 @@ void ProgressFeedback::error(const QString &message) {
void ProgressFeedback::phaseChanged() {
if (logLevel < settings::Info) return;
QString desc=converter.phaseDescription();
fprintf(stderr, "%s", S(desc));
fprintf(stdout, "%s", S(desc));

int l = desc.size();
if (converter.currentPhase() < converter.phaseCount() -1)
l += fprintf(stderr," (%d/%d)",converter.currentPhase()+1,converter.phaseCount()-1);
l += fprintf(stdout," (%d/%d)",converter.currentPhase()+1,converter.phaseCount()-1);
for (; l < lw; ++l)
fprintf(stderr, " ");
fprintf(stderr, "\n");
fprintf(stdout, "\n");
lw = 0;
fflush(stderr);
fflush(stdout);
}

/*!
\brief Update progress bar
*/
void ProgressFeedback::progressChanged(int progress) {
if (logLevel < settings::Info) return;
fprintf(stderr, "[");
fprintf(stdout, "[");
int w=60;
progress *= w;
progress /= 100;
for (int i=0; i < w; ++i) {
if (i < progress) fprintf(stderr, "=");
else if (i == progress) fprintf(stderr, ">");
else fprintf(stderr, " ");
if (i < progress) fprintf(stdout, "=");
else if (i == progress) fprintf(stdout, ">");
else fprintf(stdout, " ");
}
fprintf(stderr, "]");
fprintf(stderr, " %s", S(converter.progressString()));
fprintf(stdout, "]");
fprintf(stdout, " %s", S(converter.progressString()));
int l=1+w+2+converter.progressString().size();
for (int i=l; i < lw; ++i) fprintf(stderr, " ");
for (int i=l; i < lw; ++i) fprintf(stdout, " ");
lw = l;
fprintf(stderr, "\r");
fflush(stderr);
fprintf(stdout, "\r");
fflush(stdout);
}

ProgressFeedback::ProgressFeedback(settings::LogLevel l, Converter & _):
Expand Down