Skip to content

Replace fmt::localtime with localtime_r #2457

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
tchaikov wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

Replace fmt::localtime with localtime_r #2457

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
14 changes: 12 additions & 2 deletions src/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@ void logger_t::generate_common_prefix(std::string *str,
fmt::text_style const &ts,
char const *prefix) const
{
*str += fmt::format("{:%Y-%m-%d %H:%M:%S} ",
fmt::localtime(std::time(nullptr)));
auto const now = std::time(nullptr);
std::tm tm_local{};
#ifdef _MSC_VER
if (localtime_s(&tm_local, &now) != 0) {
throw fmt::format_error("time_t value out of range");
}
#else
if (!localtime_r(&now, &tm_local)) {
throw fmt::format_error("time_t value out of range");
}
#endif
*str += fmt::format("{:%F %T} ", tm_local);

if (m_current_level == log_level::debug) {
*str += fmt::format(ts, "[{:02d}] ", this_thread_num);
Expand Down
Loading