Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
9dc99b3d
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
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,发现更多精彩内容 >>
提交
9dc99b3d
编写于
5月 25, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-410] not print local error msg
上级
374751db
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
7 deletion
+7
-7
src/common/src/tlocale.c
src/common/src/tlocale.c
+3
-3
src/os/linux/src/linuxSysPara.c
src/os/linux/src/linuxSysPara.c
+4
-4
未找到文件。
src/common/src/tlocale.c
浏览文件 @
9dc99b3d
...
...
@@ -31,16 +31,16 @@ void tsSetLocale() {
// default locale or user specified locale is not valid, abort launch
if
(
locale
==
NULL
)
{
u
ForcePrint
(
"Invalid locale:%s, please set the valid locale in config file"
,
tsLocale
);
u
Error
(
"Invalid locale:%s, please set the valid locale in config file"
,
tsLocale
);
}
if
(
strlen
(
tsCharset
)
==
0
)
{
u
ForcePrint
(
"failed to get charset, please set the valid charset in config file"
);
u
Error
(
"failed to get charset, please set the valid charset in config file"
);
exit
(
-
1
);
}
if
(
!
taosValidateEncodec
(
tsCharset
))
{
u
ForcePrint
(
"Invalid charset:%s, please set the valid charset in config file"
,
tsCharset
);
u
Error
(
"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
浏览文件 @
9dc99b3d
...
...
@@ -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
)
{
u
ForcePrint
(
"can't get locale from system, set it to en_US.UTF-8"
);
u
Error
(
"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
));
u
ForcePrint
(
"locale not configured, set to system default:%s"
,
tsLocale
);
u
Error
(
"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
);
u
ForcePrint
(
"charset not configured, set to system default:%s"
,
tsCharset
);
u
Error
(
"charset not configured, set to system default:%s"
,
tsCharset
);
}
else
{
strcpy
(
tsCharset
,
"UTF-8"
);
u
ForcePrint
(
"can't get locale and charset from system, set it to UTF-8"
);
u
Error
(
"can't get locale and charset from system, set it to UTF-8"
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录