Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
45915eee
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
45915eee
编写于
12月 25, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Core logging fix (init debug log after it was configured in DBeaverApplication)
上级
009ccc96
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
10 deletion
+13
-10
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java
...rg/jkiss/dbeaver/core/application/DBeaverApplication.java
+3
-3
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/internal/CoreApplicationActivator.java
...r/core/application/internal/CoreApplicationActivator.java
+1
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
...ns/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
+9
-5
未找到文件。
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java
浏览文件 @
45915eee
...
...
@@ -160,7 +160,7 @@ public class DBeaverApplication extends BaseApplicationImpl {
{
String
defaultHomePath
=
getDefaultInstanceLocation
();
if
(
DBeaverCommandLine
.
handleCommandLine
(
commandLine
,
defaultHomePath
))
{
log
.
debug
(
"Commands processed. Exit "
+
GeneralUtils
.
getProductName
()
+
"."
);
System
.
err
.
println
(
"Commands processed. Exit "
+
GeneralUtils
.
getProductName
()
+
"."
);
return
IApplication
.
EXIT_OK
;
}
}
...
...
@@ -196,14 +196,14 @@ public class DBeaverApplication extends BaseApplicationImpl {
headlessMode
=
false
;
}
initDebugWriter
();
updateSplashHandler
();
final
Runtime
runtime
=
Runtime
.
getRuntime
();
// Init Core plugin and mark it as standalone version
initDebugWriter
();
log
.
debug
(
GeneralUtils
.
getProductName
()
+
" "
+
GeneralUtils
.
getProductVersion
()
+
" is starting"
);
//$NON-NLS-1$
log
.
debug
(
"OS: "
+
System
.
getProperty
(
StandardConstants
.
ENV_OS_NAME
)
+
" "
+
System
.
getProperty
(
StandardConstants
.
ENV_OS_VERSION
)
+
" ("
+
System
.
getProperty
(
StandardConstants
.
ENV_OS_ARCH
)
+
")"
);
log
.
debug
(
"Java version: "
+
System
.
getProperty
(
StandardConstants
.
ENV_JAVA_VERSION
)
+
" by "
+
System
.
getProperty
(
StandardConstants
.
ENV_JAVA_VENDOR
)
+
" ("
+
System
.
getProperty
(
StandardConstants
.
ENV_JAVA_ARCH
)
+
"bit)"
);
...
...
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/internal/CoreApplicationActivator.java
浏览文件 @
45915eee
...
...
@@ -32,7 +32,6 @@ public class CoreApplicationActivator extends AbstractUIPlugin {
// The plug-in ID
public
static
final
String
PLUGIN_ID
=
"org.jkiss.dbeaver.core.application"
;
private
static
final
Log
log
=
Log
.
getLog
(
CoreApplicationActivator
.
class
);
// The shared instance
private
static
CoreApplicationActivator
plugin
;
...
...
@@ -71,7 +70,7 @@ public class CoreApplicationActivator extends AbstractUIPlugin {
}
}
if
(
message
!=
null
)
{
log
.
debug
(
message
);
System
.
err
.
println
(
message
);
}
},
null
);
//context.addBundleListener(new BundleLoadListener());
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
浏览文件 @
45915eee
...
...
@@ -53,7 +53,7 @@ public class Log
private
final
String
name
;
private
static
ThreadLocal
<
PrintWriter
>
logWriter
=
new
ThreadLocal
<>();
private
static
boolean
quietMode
;
private
static
final
PrintWriter
DEFAULT_DEBUG_WRITER
=
new
PrintWriter
(
System
.
err
);
;
private
static
PrintWriter
DEFAULT_DEBUG_WRITER
;
public
static
Log
getLog
(
Class
<?>
forClass
)
{
return
new
Log
(
forClass
.
getName
());
...
...
@@ -175,11 +175,15 @@ public class Log
private
void
debugMessage
(
Object
message
,
Throwable
t
)
{
PrintWriter
logStream
=
logWriter
.
get
();
PrintWriter
debugWriter
=
logStream
!=
null
?
logStream
:
(
quietMode
?
null
:
DEFAULT_DEBUG_WRITER
);
if
(
debugWriter
==
null
)
{
return
;
}
synchronized
(
Log
.
class
)
{
if
(
DEFAULT_DEBUG_WRITER
==
null
)
{
DEFAULT_DEBUG_WRITER
=
new
PrintWriter
(
System
.
err
,
true
);
}
PrintWriter
debugWriter
=
logStream
!=
null
?
logStream
:
(
quietMode
?
null
:
DEFAULT_DEBUG_WRITER
);
if
(
debugWriter
==
null
)
{
return
;
}
debugWriter
.
print
(
sdf
.
format
(
new
Date
())
+
" - "
);
//$NON-NLS-1$
if
(
message
!=
null
)
{
debugWriter
.
println
(
message
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录