Skip to content

Commit

Permalink
[TD-410] not print local error msg
Browse files Browse the repository at this point in the history
  • Loading branch information
guanshengliang committed May 25, 2020
1 parent 374751d commit 9dc99b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/common/src/tlocale.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 4 additions & 4 deletions src/os/linux/src/linuxSysPara.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand All @@ -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");
}
}
}
Expand Down

0 comments on commit 9dc99b3

Please sign in to comment.