Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Questdb
提交
41f3d6f2
Q
Questdb
项目概览
jobily
/
Questdb
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
Questdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
41f3d6f2
编写于
10月 15, 2020
作者:
V
Vlad Ilyushchenko
提交者:
GitHub
10月 15, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore(main): logging telemetry id and forcing debug level from Env variable (#645)
上级
bc92d78e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
55 addition
and
17 deletion
+55
-17
core/src/main/java/io/questdb/ServerMain.java
core/src/main/java/io/questdb/ServerMain.java
+8
-6
core/src/main/java/io/questdb/TelemetryJob.java
core/src/main/java/io/questdb/TelemetryJob.java
+23
-5
core/src/main/java/io/questdb/log/LogFactory.java
core/src/main/java/io/questdb/log/LogFactory.java
+7
-2
core/src/main/java/io/questdb/log/LogRecord.java
core/src/main/java/io/questdb/log/LogRecord.java
+2
-0
core/src/main/java/io/questdb/log/Logger.java
core/src/main/java/io/questdb/log/Logger.java
+6
-0
core/src/main/java/io/questdb/log/NullLogRecord.java
core/src/main/java/io/questdb/log/NullLogRecord.java
+9
-4
未找到文件。
core/src/main/java/io/questdb/ServerMain.java
浏览文件 @
41f3d6f2
...
...
@@ -120,24 +120,26 @@ public class ServerMain {
log
.
info
().
$
(
"database root [dir="
).
$
(
path
).
$
(
']'
).
$
();
}
}
log
.
info
().
$
(
"platform [bit="
).
$
(
System
.
getProperty
(
"sun.arch.data.model"
)).
$
(
']'
).
$
();
switch
(
Os
.
type
)
{
case
Os
.
WINDOWS
:
log
.
info
().
$
(
"OS: windows-amd64
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
info
().
$
(
"OS: windows-amd64"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
case
Os
.
LINUX_AMD64
:
log
.
info
().
$
(
"OS: linux-amd64
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
info
().
$
(
"OS: linux-amd64"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
case
Os
.
OSX
:
log
.
info
().
$
(
"OS: apple-amd64
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
info
().
$
(
"OS: apple-amd64"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
case
Os
.
LINUX_ARM64
:
log
.
info
().
$
(
"OS: linux-arm64
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
info
().
$
(
"OS: linux-arm64"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
case
Os
.
FREEBSD
:
log
.
info
().
$
(
"OS: freebsd-amd64
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
info
().
$
(
"OS: freebsd-amd64"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
default
:
log
.
error
().
$
(
"Unsupported OS
"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
log
.
error
().
$
(
"Unsupported OS"
).
$
(
Vect
.
getSupportedInstructionSetName
()).
$
();
break
;
}
...
...
core/src/main/java/io/questdb/TelemetryJob.java
浏览文件 @
41f3d6f2
...
...
@@ -35,11 +35,11 @@ import io.questdb.mp.QueueConsumer;
import
io.questdb.mp.RingQueue
;
import
io.questdb.mp.SCSequence
;
import
io.questdb.mp.SynchronizedJob
;
import
io.questdb.std.Long256
;
import
io.questdb.std.Misc
;
import
io.questdb.std.NanosecondClock
;
import
io.questdb.std.microtime.MicrosecondClock
;
import
io.questdb.std.str.Path
;
import
io.questdb.std.str.StringSink
;
import
io.questdb.tasks.TelemetryTask
;
import
org.jetbrains.annotations.Nullable
;
...
...
@@ -119,23 +119,41 @@ public class TelemetryJob extends SynchronizedJob implements Closeable {
final
Record
record
=
cursor
.
getRecord
();
final
boolean
_enabled
=
record
.
getBool
(
1
);
// if the configuration changed to enable or disable telemetry
// we need to update the table to reflect that
if
(
enabled
!=
_enabled
)
{
final
StringSink
sink
=
new
StringSink
();
final
TableWriter
.
Row
row
=
writerConfig
.
newRow
();
record
.
getLong256
(
0
,
sink
);
row
.
putLong256
(
0
,
sink
);
final
Long256
l256
=
record
.
getLong256A
(
0
);
row
.
putLong256
(
0
,
l256
);
row
.
putBool
(
1
,
enabled
);
row
.
append
();
writerConfig
.
commit
();
LOG
.
info
()
.
$
(
"instance config changes [id="
).
$
256
(
l256
.
getLong0
(),
l256
.
getLong1
(),
0
,
0
)
.
$
(
", enabled="
).
$
(
this
.
enabled
)
.
$
(
']'
).
$
();
}
else
{
final
Long256
l256
=
record
.
getLong256A
(
0
);
LOG
.
error
()
.
$
(
"instance [id="
).
$
256
(
l256
.
getLong0
(),
l256
.
getLong1
(),
0
,
0
)
.
$
(
", enabled="
).
$
(
this
.
enabled
)
.
$
(
']'
).
$
();
}
}
else
{
// if there are no record for telemetry id we need to create one using clocks
final
MicrosecondClock
clock
=
configuration
.
getMicrosecondClock
();
final
NanosecondClock
nanosecondClock
=
configuration
.
getNanosecondClock
();
final
TableWriter
.
Row
row
=
writerConfig
.
newRow
();
row
.
putLong256
(
0
,
nanosecondClock
.
getTicks
(),
clock
.
getTicks
(),
0
,
0
);
final
long
a
=
nanosecondClock
.
getTicks
();
final
long
b
=
clock
.
getTicks
();
row
.
putLong256
(
0
,
a
,
b
,
0
,
0
);
row
.
putBool
(
1
,
enabled
);
row
.
append
();
writerConfig
.
commit
();
LOG
.
info
()
.
$
(
"new instance [id="
).
$
256
(
a
,
b
,
0
,
0
)
.
$
(
", enabled="
).
$
(
this
.
enabled
)
.
$
(
']'
).
$
();
}
}
...
...
core/src/main/java/io/questdb/log/LogFactory.java
浏览文件 @
41f3d6f2
...
...
@@ -39,6 +39,7 @@ public class LogFactory implements Closeable {
public
static
final
LogFactory
INSTANCE
=
new
LogFactory
();
public
static
final
String
DEBUG_TRIGGER
=
"ebug"
;
public
static
final
String
DEBUG_TRIGGER_ENV
=
"QDB_DEBUG"
;
public
static
final
String
CONFIG_SYSTEM_PROPERTY
=
"questdbLog"
;
private
static
final
int
DEFAULT_QUEUE_DEPTH
=
1024
;
...
...
@@ -342,7 +343,7 @@ public class LogFactory implements Closeable {
}
}
if
(
System
.
getProperty
(
DEBUG_TRIGGER
)
!=
null
)
{
if
(
isForcedDebug
()
)
{
level
=
level
|
LogLevel
.
LOG_LEVEL_DEBUG
;
}
...
...
@@ -375,6 +376,10 @@ public class LogFactory implements Closeable {
});
}
private
static
boolean
isForcedDebug
()
{
return
System
.
getProperty
(
DEBUG_TRIGGER
)
!=
null
||
System
.
getenv
().
containsKey
(
DEBUG_TRIGGER_ENV
);
}
/**
* Converts fully qualified class name into an abbreviated form:
* com.questdb.mp.Sequence -> c.n.m.Sequence
...
...
@@ -412,7 +417,7 @@ public class LogFactory implements Closeable {
private
void
configureDefaultWriter
()
{
int
level
=
LogLevel
.
LOG_LEVEL_INFO
|
LogLevel
.
LOG_LEVEL_ERROR
;
if
(
System
.
getProperty
(
DEBUG_TRIGGER
)
!=
null
)
{
if
(
isForcedDebug
()
)
{
level
=
level
|
LogLevel
.
LOG_LEVEL_DEBUG
;
}
add
(
new
LogWriterConfig
(
level
,
LogConsoleWriter:
:
new
));
...
...
core/src/main/java/io/questdb/log/LogRecord.java
浏览文件 @
41f3d6f2
...
...
@@ -57,6 +57,8 @@ public interface LogRecord {
LogRecord
$ts
(
long
x
);
LogRecord
$
256
(
long
a
,
long
b
,
long
c
,
long
d
);
boolean
isEnabled
();
LogRecord
ts
();
...
...
core/src/main/java/io/questdb/log/Logger.java
浏览文件 @
41f3d6f2
...
...
@@ -201,6 +201,12 @@ class Logger implements LogRecord, Log {
return
this
;
}
@Override
public
LogRecord
$
256
(
long
a
,
long
b
,
long
c
,
long
d
)
{
Numbers
.
appendLong256
(
a
,
b
,
c
,
d
,
sink
());
return
this
;
}
@Override
public
LogRecord
debug
()
{
return
xdebug
().
ts
().
$
(
" D "
).
$
(
name
);
...
...
core/src/main/java/io/questdb/log/NullLogRecord.java
浏览文件 @
41f3d6f2
...
...
@@ -44,6 +44,11 @@ final class NullLogRecord implements LogRecord {
return
this
;
}
@Override
public
LogRecord
$
(
CharSequence
sequence
,
int
lo
,
int
hi
)
{
return
this
;
}
@Override
public
LogRecord
$
(
int
x
)
{
return
this
;
...
...
@@ -100,13 +105,13 @@ final class NullLogRecord implements LogRecord {
}
@Override
public
boolean
isEnabled
(
)
{
return
false
;
public
LogRecord
$
256
(
long
a
,
long
b
,
long
c
,
long
d
)
{
return
this
;
}
@Override
public
LogRecord
$
(
CharSequence
sequence
,
int
lo
,
int
hi
)
{
return
this
;
public
boolean
isEnabled
(
)
{
return
false
;
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录