xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-410] not print local error msg

This commit is contained in:
Shengliang Guan 2020-05-25 13:59:08 +08:00
parent 374751dba5
commit 9dc99b3df7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/src/tlocale.c
View File

@ -31,16 +31,16 @@ void tsSetLocale() {
// default locale or user specified locale is not valid, abort launch
if (locale == NULL) {
uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale);
uError("Invalid locale:%s, please set the valid locale in config file", tsLocale);
}
if (strlen(tsCharset) == 0) {
uForcePrint("failed to get charset, please set the valid charset in config file");
uError("failed to get charset, please set the valid charset in config file");
exit(-1);
}
if (!taosValidateEncodec(tsCharset)) {
uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset);
uError("Invalid charset:%s, please set the valid charset in config file", tsCharset);
exit(-1);
}
}

8
src/os/linux/src/linuxSysPara.c
View File

@ -226,11 +226,11 @@ static void taosGetSystemLocale() { // get and set default locale
if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
locale = setlocale(LC_CTYPE, "");
if (locale == NULL) {
uForcePrint("can't get locale from system, set it to en_US.UTF-8");
uError("can't get locale from system, set it to en_US.UTF-8");
strcpy(tsLocale, "en_US.UTF-8");
} else {
strncpy(tsLocale, locale, tListLen(tsLocale));
uForcePrint("locale not configured, set to system default:%s", tsLocale);
uError("locale not configured, set to system default:%s", tsLocale);
}
}
@ -245,10 +245,10 @@ static void taosGetSystemLocale() { // get and set default locale
strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
free(revisedCharset);
uForcePrint("charset not configured, set to system default:%s", tsCharset);
uError("charset not configured, set to system default:%s", tsCharset);
} else {
strcpy(tsCharset, "UTF-8");
uForcePrint("can't get locale and charset from system, set it to UTF-8");
uError("can't get locale and charset from system, set it to UTF-8");
}
}
}