Commit 77d4a14d authored by David Dorwin's avatar David Dorwin Committed by Commit Bot

[Fuchsia] Make external timezone data failure a WARNING

Reduce the severity unless/until the underlying issue is addressed.

Bug: 1061262
Change-Id: I73d2b5f74bafaab182bbd36394cecb2f2d29ef75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2044525Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751584}
parent b215364a
......@@ -208,10 +208,10 @@ void LazyOpenIcuDataFile() {
g_icudtl_region = pf_region->region;
}
// Loads timezone data, for configurations where it makes sense. If the
// timezone data directory is not set up properly, we continue, but log
// Loads external timezone data, for configurations where it makes sense.
// If the timezone data directory is not set up properly, we continue but log
// appropriate information for debugging.
void InitializeTimeZoneData() {
void InitializeExternalTimeZoneData() {
#if defined(OS_FUCHSIA)
std::unique_ptr<base::Environment> env = base::Environment::Create();
......@@ -227,8 +227,9 @@ void InitializeTimeZoneData() {
// directory since ICU loading will return an error if the TimeZone data is
// wrong.
if (!base::DirectoryExists(base::FilePath(tzdata_dir))) {
PLOG(ERROR) << "Could not open: '" << tzdata_dir
<< "', proceeding without loading the timezone database";
// TODO(https://crbug.com/1061262): Make this FATAL unless expected.
PLOG(WARNING) << "Could not open: '" << tzdata_dir
<< "'. Using built-in timezone database";
return;
}
#endif // defined(OS_FUCHSIA)
......@@ -238,7 +239,7 @@ int LoadIcuData(PlatformFile data_fd,
const MemoryMappedFile::Region& data_region,
std::unique_ptr<MemoryMappedFile>* out_mapped_data_file,
UErrorCode* out_error_code) {
InitializeTimeZoneData();
InitializeExternalTimeZoneData();
if (data_fd == kInvalidPlatformFile) {
LOG(ERROR) << "Invalid file descriptor to ICU data received.";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment