Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
codyshao
TDengine
提交
e68a7433
T
TDengine
项目概览
codyshao
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e68a7433
编写于
5月 01, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
exit while locale not set in docker
上级
59a39792
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
14 deletion
+13
-14
src/common/inc/tulog.h
src/common/inc/tulog.h
+2
-0
src/common/src/tlocale.c
src/common/src/tlocale.c
+3
-10
src/os/linux/src/linuxSysPara.c
src/os/linux/src/linuxSysPara.c
+7
-3
src/plugins/http/src/httpServer.c
src/plugins/http/src/httpServer.c
+1
-1
未找到文件。
src/common/inc/tulog.h
浏览文件 @
e68a7433
...
...
@@ -43,6 +43,8 @@ extern int32_t tscEmbedded;
}
#define uPrint(...) \
{ taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
#define uForcePrint(...) \
{ taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); }
#define pError(...) \
{ taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }
...
...
src/common/src/tlocale.c
浏览文件 @
e68a7433
...
...
@@ -27,27 +27,20 @@
* In case that the setLocale failed to be executed, the right charset needs to be set.
*/
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
);
// default locale or user specified locale is not valid, abort launch
if
(
locale
==
NULL
)
{
printf
(
msgLocale
,
tsLocale
);
uPrint
(
msgLocale
,
tsLocale
);
uForcePrint
(
"Invalid locale:%s, please set the valid locale in config file"
,
tsLocale
);
}
if
(
strlen
(
tsCharset
)
==
0
)
{
printf
(
"%s
\n
"
,
msgCharset1
);
uPrint
(
msgCharset1
);
uForcePrint
(
"failed to get charset, please set the valid charset in config file"
);
exit
(
-
1
);
}
if
(
!
taosValidateEncodec
(
tsCharset
))
{
printf
(
msgCharset
,
tsCharset
);
uPrint
(
msgCharset
,
tsCharset
);
uForcePrint
(
"Invalid charset:%s, please set the valid charset in config file"
,
tsCharset
);
exit
(
-
1
);
}
}
\ No newline at end of file
src/os/linux/src/linuxSysPara.c
浏览文件 @
e68a7433
...
...
@@ -225,10 +225,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
)
{
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
{
strncpy
(
tsLocale
,
locale
,
tListLen
(
tsLocale
));
uPrint
(
"locale not configured, set to system default:%s"
,
tsLocale
);
u
Force
Print
(
"locale not configured, set to system default:%s"
,
tsLocale
);
}
}
...
...
@@ -243,7 +244,10 @@ static void taosGetSystemLocale() { // get and set default locale
strncpy
(
tsCharset
,
revisedCharset
,
tListLen
(
tsCharset
));
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"
);
}
}
}
...
...
src/plugins/http/src/httpServer.c
浏览文件 @
e68a7433
...
...
@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) {
pServer
->
serverPort
);
return
;
}
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
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录