提交 e68a7433 编写于 作者: S slguan

exit while locale not set in docker

上级 59a39792
...@@ -43,6 +43,8 @@ extern int32_t tscEmbedded; ...@@ -43,6 +43,8 @@ extern int32_t tscEmbedded;
} }
#define uPrint(...) \ #define uPrint(...) \
{ taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
#define uForcePrint(...) \
{ taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); }
#define pError(...) \ #define pError(...) \
{ taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }
......
...@@ -27,27 +27,20 @@ ...@@ -27,27 +27,20 @@
* In case that the setLocale failed to be executed, the right charset needs to be set. * In case that the setLocale failed to be executed, the right charset needs to be set.
*/ */
void tsSetLocale() { void tsSetLocale() {
char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n";
char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n";
char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
char *locale = setlocale(LC_CTYPE, tsLocale); char *locale = setlocale(LC_CTYPE, tsLocale);
// default locale or user specified locale is not valid, abort launch // default locale or user specified locale is not valid, abort launch
if (locale == NULL) { if (locale == NULL) {
printf(msgLocale, tsLocale); uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale);
uPrint(msgLocale, tsLocale);
} }
if (strlen(tsCharset) == 0) { if (strlen(tsCharset) == 0) {
printf("%s\n", msgCharset1); uForcePrint("failed to get charset, please set the valid charset in config file");
uPrint(msgCharset1);
exit(-1); exit(-1);
} }
if (!taosValidateEncodec(tsCharset)) { if (!taosValidateEncodec(tsCharset)) {
printf(msgCharset, tsCharset); uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset);
uPrint(msgCharset, tsCharset);
exit(-1); exit(-1);
} }
} }
\ No newline at end of file
...@@ -225,10 +225,11 @@ static void taosGetSystemLocale() { // get and set default locale ...@@ -225,10 +225,11 @@ static void taosGetSystemLocale() { // get and set default locale
if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) { if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
locale = setlocale(LC_CTYPE, ""); locale = setlocale(LC_CTYPE, "");
if (locale == NULL) { if (locale == NULL) {
uError("can't get locale from system"); uForcePrint("can't get locale from system, set it to en_US.UTF-8");
strcpy(tsLocale, "en_US.UTF-8");
} else { } else {
strncpy(tsLocale, locale, tListLen(tsLocale)); strncpy(tsLocale, locale, tListLen(tsLocale));
uPrint("locale not configured, set to system default:%s", tsLocale); uForcePrint("locale not configured, set to system default:%s", tsLocale);
} }
} }
...@@ -243,7 +244,10 @@ static void taosGetSystemLocale() { // get and set default locale ...@@ -243,7 +244,10 @@ static void taosGetSystemLocale() { // get and set default locale
strncpy(tsCharset, revisedCharset, tListLen(tsCharset)); strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
free(revisedCharset); free(revisedCharset);
uPrint("charset not configured, set to system default:%s", tsCharset); uForcePrint("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");
} }
} }
} }
......
...@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) { ...@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) {
pServer->serverPort); pServer->serverPort);
return; return;
} else { } else {
httpPrint("http service init success at ip:%s:%u", pServer->serverIp, pServer->serverPort); httpPrint("http service init success at %u", pServer->serverPort);
pServer->online = true; pServer->online = true;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册