blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 06:30:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #231 from dpaulat/feature/timezone-fallback

Browse source 
Fallback gracefully when zoned time processing fails
This commit is contained in:
Dan Paulat 2024-06-25 23:04:56 -05:00 • committed by GitHub
commit 76cd000650
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
wxdata/source/scwx/util/time.cpp
View file

@ -10,6 +10,7 @@
#include <scwx/util/time.hpp> #include <scwx/util/time.hpp>
#include <scwx/util/enum.hpp> #include <scwx/util/enum.hpp>
#include <scwx/util/logger.hpp>
#include <sstream> #include <sstream>
#include <unordered_map> #include <unordered_map>
@ -25,6 +26,9 @@ namespace scwx
namespace util namespace util
{ {
static const std::string logPrefix_ = "scwx::util::time";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
static const std::unordered_map<ClockFormat, std::string> clockFormatName_ { static const std::unordered_map<ClockFormat, std::string> clockFormatName_ {
{ClockFormat::_12Hour, "12-hour"}, {ClockFormat::_12Hour, "12-hour"},
{ClockFormat::_24Hour, "24-hour"}, {ClockFormat::_24Hour, "24-hour"},
@ -71,18 +75,35 @@ std::string TimeString(std::chrono::system_clock::time_point time,
{ {
if (timeZone != nullptr) if (timeZone != nullptr)
{ {
zoned_time zt = {timeZone, timeInSeconds}; try
{
zoned_time zt = {timeZone, timeInSeconds};
if (clockFormat == ClockFormat::_24Hour) if (clockFormat == ClockFormat::_24Hour)
{ {
os << format(FORMAT_STRING_24_HOUR, zt); os << format(FORMAT_STRING_24_HOUR, zt);
}
else
{
os << format(FORMAT_STRING_12_HOUR, zt);
}
} }
else catch (const std::exception& ex)
{ {
os << format(FORMAT_STRING_12_HOUR, zt); static bool firstException = true;
if (firstException)
{
logger_->warn("Zoned time error: {}", ex.what());
firstException = false;
}
// In the case where there is a time zone error (e.g., timezone
// database, unicode issue, etc.), fall back to UTC
timeZone = nullptr;
} }
} }
else
if (timeZone == nullptr)
{ {
if (clockFormat == ClockFormat::_24Hour) if (clockFormat == ClockFormat::_24Hour)
{ {