Skip to content

FIX: Some errors are not redirected to the log file #31 #32

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

Merged
jordan-evens merged 1 commit into from
Jun 17, 2026
Merged

FIX: Some errors are not redirected to the log file #31 #32

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
18 changes: 18 additions & 0 deletions src/cpp/fs/Log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: AGPL-3.0-or-later */
#include "Log.h"
#include <tiffio.h>
#ifdef NDEBUG
#ifdef _WIN32
#include "TimeUtil.h"
Expand Down Expand Up @@ -54,6 +55,21 @@ ofstream* out_file() noexcept
}
mutex mutex_{};
ostream* output_{pre_file_log()};
// HACK: rely on error handler being set when log is opened
void handle_tiff_error(const char* module, const char* fmt, va_list args)
{
const string tmp;
stringstream iss(tmp);
// HACK: just use a static size instead of trying to determine
char buffer[1024]{0};
vsnprintf(buffer, std::size(buffer), fmt, args);
if (module && 0 < strlen(module))
{
iss << module << ": ";
}
iss << buffer;
std::ignore = output(logging::level::error, "{}", iss.str());
}
int open_log_file(const char* filename) noexcept
{
lock_guard<mutex> lock(mutex_);
Expand All @@ -73,6 +89,8 @@ int open_log_file(const char* filename) noexcept
prefile->clear();
}
output_ = outfile;
// HACK: redirect TIFF errors here since log is always opened
TIFFSetErrorHandler(&handle_tiff_error);
return true;
}
int close_log_file() noexcept
Expand Down
Loading