thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use contents of env TZ as the name for timezone

Browse Source
This commit is contained in:
Ivan Lezhankin 2019-05-28 14:33:21 +03:00
parent b7d0add7a8
commit a390428cd8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/libcommon/src/DateLUT.cpp
View File

@ -32,6 +32,11 @@ std::string determineDefaultTimeZone()
fs::path tz_file_path; fs::path tz_file_path;
std::string error_prefix; std::string error_prefix;
const char * tz_env_var = std::getenv("TZ"); const char * tz_env_var = std::getenv("TZ");
/// In recent tzdata packages some files now are symlinks and canonical path resolution
/// may give wrong timezone names - store the name as it is, if possible.
std::string tz_name;
if (tz_env_var) if (tz_env_var)
{ {
error_prefix = std::string("Could not determine time zone from TZ variable value: `") + tz_env_var + "': "; error_prefix = std::string("Could not determine time zone from TZ variable value: `") + tz_env_var + "': ";
@ -40,11 +45,12 @@ std::string determineDefaultTimeZone()
++tz_env_var; ++tz_env_var;
tz_file_path = tz_env_var; tz_file_path = tz_env_var;
tz_name = tz_env_var;
} }
else else
{ {
error_prefix = "Could not determine local time zone: "; error_prefix = "Could not determine local time zone: ";
tz_file_path = "/etc/localtime"; tz_file_path = "/etc/localtime"; /// FIXME: in case of no TZ use the immediate linked file as tz name.
} }
try try
@ -56,7 +62,7 @@ std::string determineDefaultTimeZone()
/// then the relative path is the time zone id. /// then the relative path is the time zone id.
fs::path relative_path = tz_file_path.lexically_relative(tz_database_path); fs::path relative_path = tz_file_path.lexically_relative(tz_database_path);
if (!relative_path.empty() && *relative_path.begin() != ".." && *relative_path.begin() != ".") if (!relative_path.empty() && *relative_path.begin() != ".." && *relative_path.begin() != ".")
return relative_path.string(); return tz_name.empty() ? relative_path.string() : tz_name;
/// The file is not inside the tz_database_dir, so we hope that it was copied and /// The file is not inside the tz_database_dir, so we hope that it was copied and
/// try to find the file with exact same contents in the database. /// try to find the file with exact same contents in the database.