Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_50753323
TDengine
提交
ac5a9c9b
T
TDengine
项目概览
qq_50753323
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
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,发现更多精彩内容 >>
未验证
提交
ac5a9c9b
编写于
1月 06, 2020
作者:
F
fangpanpan
提交者:
GitHub
1月 06, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1087 from taosdata/feature/lihui
[TBASE-1167]
上级
7dbd807a
5066571f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
6 deletion
+12
-6
src/util/src/tlog.c
src/util/src/tlog.c
+12
-6
未找到文件。
src/util/src/tlog.c
浏览文件 @
ac5a9c9b
...
@@ -45,6 +45,7 @@ typedef struct {
...
@@ -45,6 +45,7 @@ typedef struct {
uint32_t
uDebugFlag
=
131
;
// all the messages
uint32_t
uDebugFlag
=
131
;
// all the messages
short
tsAsyncLog
=
1
;
short
tsAsyncLog
=
1
;
static
pid_t
logPid
=
0
;
static
SLogBuff
*
logHandle
=
NULL
;
static
SLogBuff
*
logHandle
=
NULL
;
static
int
taosLogFileNum
=
1
;
static
int
taosLogFileNum
=
1
;
static
int
taosLogMaxLines
=
0
;
static
int
taosLogMaxLines
=
0
;
...
@@ -82,6 +83,11 @@ int taosStartLog() {
...
@@ -82,6 +83,11 @@ int taosStartLog() {
}
}
int
taosInitLog
(
char
*
logName
,
int
numOfLogLines
,
int
maxFiles
)
{
int
taosInitLog
(
char
*
logName
,
int
numOfLogLines
,
int
maxFiles
)
{
#ifdef LINUX
logPid
=
(
pid_t
)
syscall
(
SYS_gettid
);
#endif
logHandle
=
taosLogBuffNew
(
TSDB_DEFAULT_LOG_BUF_SIZE
);
logHandle
=
taosLogBuffNew
(
TSDB_DEFAULT_LOG_BUF_SIZE
);
if
(
logHandle
==
NULL
)
return
-
1
;
if
(
logHandle
==
NULL
)
return
-
1
;
...
@@ -306,8 +312,8 @@ char *tprefix(char *prefix) {
...
@@ -306,8 +312,8 @@ char *tprefix(char *prefix) {
sprintf
(
prefix
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
sprintf
(
prefix
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
#else
#else
sprintf
(
prefix
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
sprintf
(
prefix
,
"%02d/%02d %02d:%02d:%02d.%06d
%d
0x%lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
pthread_self
());
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
logPid
,
pthread_self
());
#endif
#endif
return
prefix
;
return
prefix
;
}
}
...
@@ -333,8 +339,8 @@ void tprintf(const char *const flags, int dflag, const char *const format, ...)
...
@@ -333,8 +339,8 @@ void tprintf(const char *const flags, int dflag, const char *const format, ...)
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
#else
#else
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d %lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d %
d %
lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
pthread_self
());
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
logPid
,
pthread_self
());
#endif
#endif
len
+=
sprintf
(
buffer
+
len
,
"%s"
,
flags
);
len
+=
sprintf
(
buffer
+
len
,
"%s"
,
flags
);
...
@@ -424,8 +430,8 @@ void taosPrintLongString(const char *const flags, int dflag, const char *const f
...
@@ -424,8 +430,8 @@ void taosPrintLongString(const char *const flags, int dflag, const char *const f
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d 0x%lld "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
taosGetPthreadId
());
#else
#else
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d %lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
len
=
sprintf
(
buffer
,
"%02d/%02d %02d:%02d:%02d.%06d %
d %
lx "
,
ptm
->
tm_mon
+
1
,
ptm
->
tm_mday
,
ptm
->
tm_hour
,
ptm
->
tm_min
,
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
pthread_self
());
ptm
->
tm_sec
,
(
int
)
timeSecs
.
tv_usec
,
logPid
,
pthread_self
());
#endif
#endif
len
+=
sprintf
(
buffer
+
len
,
"%s"
,
flags
);
len
+=
sprintf
(
buffer
+
len
,
"%s"
,
flags
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录