Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
e7d0818b
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,发现更多精彩内容 >>
提交
e7d0818b
编写于
12月 18, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6972 Native tool running: error log reading + settings handle fixes
上级
567ea5bd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
20 deletion
+29
-20
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
...jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
+8
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
...ns/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
+10
-16
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskRunJob.java
...istry/src/org/jkiss/dbeaver/registry/task/TaskRunJob.java
+2
-1
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
...s/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
+5
-1
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolSettings.java
.../dbeaver/tasks/nativetool/AbstractNativeToolSettings.java
+4
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java
浏览文件 @
e7d0818b
...
...
@@ -39,8 +39,14 @@ public abstract class MySQLNativeToolHandler<SETTINGS extends AbstractNativeTool
if
(!
CommonUtils
.
isEmpty
(
connectionInfo
.
getHostPort
()))
{
cmd
.
add
(
"--port="
+
connectionInfo
.
getHostPort
());
}
cmd
.
add
(
"-u"
);
cmd
.
add
(
settings
.
getToolUserName
());
String
toolUserName
=
settings
.
getToolUserName
();
if
(
CommonUtils
.
isEmpty
(
toolUserName
))
{
toolUserName
=
settings
.
getDataSourceContainer
().
getActualConnectionConfiguration
().
getUserName
();
}
if
(!
CommonUtils
.
isEmpty
(
toolUserName
))
{
cmd
.
add
(
"-u"
);
cmd
.
add
(
toolUserName
);
}
// Password is passed in env variable (#1004)
// if (!CommonUtils.isEmpty(toolWizard.getToolUserPassword())) {
// cmd.add("--password=" + toolWizard.getToolUserPassword());
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java
浏览文件 @
e7d0818b
...
...
@@ -24,10 +24,8 @@ import org.jkiss.dbeaver.bundle.ModelActivator;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.ArrayUtils
;
import
java.io.OutputStream
;
import
java.io.PrintStream
;
import
java.io.UnsupportedEncodingException
;
import
java.nio.charset.StandardCharsets
;
import
java.io.PrintWriter
;
import
java.io.Writer
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
...
...
@@ -53,8 +51,9 @@ public class Log
}
private
final
String
name
;
private
static
ThreadLocal
<
Print
Stream
>
logWriter
=
new
ThreadLocal
<>();
private
static
ThreadLocal
<
Print
Writer
>
logWriter
=
new
ThreadLocal
<>();
private
static
boolean
quietMode
;
private
static
final
PrintWriter
DEFAULT_DEBUG_WRITER
=
new
PrintWriter
(
System
.
err
);;
public
static
Log
getLog
(
Class
<?>
forClass
)
{
return
new
Log
(
forClass
.
getName
());
...
...
@@ -64,20 +63,15 @@ public class Log
return
quietMode
;
}
public
static
Print
Stream
getLogWriter
()
{
public
static
Print
Writer
getLogWriter
()
{
return
logWriter
.
get
();
}
public
static
void
setLogWriter
(
OutputStream
logWriter
)
{
public
static
void
setLogWriter
(
Writer
logWriter
)
{
if
(
logWriter
==
null
)
{
Log
.
logWriter
.
remove
();
}
else
{
PrintStream
printStream
;
try
{
printStream
=
new
PrintStream
(
logWriter
,
true
,
StandardCharsets
.
UTF_8
.
toString
());
}
catch
(
UnsupportedEncodingException
e
)
{
printStream
=
new
PrintStream
(
logWriter
,
true
);
}
PrintWriter
printStream
=
new
PrintWriter
(
logWriter
,
true
);
Log
.
logWriter
.
set
(
printStream
);
}
}
...
...
@@ -116,7 +110,7 @@ public class Log
}
public
void
flush
()
{
Print
Stream
logStream
=
logWriter
.
get
();
Print
Writer
logStream
=
logWriter
.
get
();
if
(
logStream
!=
null
)
{
logStream
.
flush
();
}
...
...
@@ -180,8 +174,8 @@ public class Log
}
private
void
debugMessage
(
Object
message
,
Throwable
t
)
{
Print
Stream
logStream
=
logWriter
.
get
();
Print
Stream
debugWriter
=
logStream
!=
null
?
logStream
:
(
quietMode
?
null
:
System
.
err
);
Print
Writer
logStream
=
logWriter
.
get
();
Print
Writer
debugWriter
=
logStream
!=
null
?
logStream
:
(
quietMode
?
null
:
DEFAULT_DEBUG_WRITER
);
if
(
debugWriter
==
null
)
{
return
;
}
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskRunJob.java
浏览文件 @
e7d0818b
...
...
@@ -31,6 +31,7 @@ import org.jkiss.utils.StandardConstants;
import
java.io.*
;
import
java.lang.reflect.InvocationTargetException
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Date
;
import
java.util.Locale
;
import
java.util.concurrent.atomic.AtomicInteger
;
...
...
@@ -79,7 +80,7 @@ public class TaskRunJob extends AbstractJob implements DBRRunnableContext {
task
.
getTaskStatsFolder
(
true
);
File
logFile
=
task
.
getRunLog
(
taskRun
);
try
(
OutputStream
logStream
=
new
FileOutputStream
(
logFile
))
{
try
(
Writer
logStream
=
new
OutputStreamWriter
(
new
FileOutputStream
(
logFile
),
StandardCharsets
.
UTF_8
))
{
taskLog
=
Log
.
getLog
(
TaskRunJob
.
class
);
Log
.
setLogWriter
(
logStream
);
try
{
...
...
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java
浏览文件 @
e7d0818b
...
...
@@ -52,10 +52,13 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
monitor
.
beginTask
(
task
.
getType
().
getName
(),
1
);
monitor
.
subTask
(
task
.
getType
().
getName
());
Log
.
setLogWriter
(
logStream
);
try
{
doExecute
(
monitor
,
task
,
settings
,
log
);
}
catch
(
Exception
e
)
{
throw
new
InvocationTargetException
(
e
);
}
finally
{
Log
.
setLogWriter
(
null
);
}
monitor
.
worked
(
1
);
...
...
@@ -173,7 +176,8 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
try
{
final
int
exitCode
=
process
.
exitValue
();
if
(
exitCode
!=
0
)
{
throw
new
IOException
(
"Process error code: "
+
exitCode
);
log
.
error
(
"Process exit code: "
+
exitCode
);
return
false
;
}
}
catch
(
IllegalThreadStateException
e
)
{
// Still running
...
...
plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolSettings.java
浏览文件 @
e7d0818b
...
...
@@ -115,9 +115,13 @@ public abstract class AbstractNativeToolSettings<BASE_OBJECT extends DBSObject>
}
if
(!
CommonUtils
.
isEmpty
(
toolUserName
))
{
preferenceStore
.
setValue
(
"toolUserName"
,
toolUserName
);
}
else
{
preferenceStore
.
setToDefault
(
"toolUserName"
);
}
if
(!
CommonUtils
.
isEmpty
(
toolUserPassword
))
{
preferenceStore
.
setValue
(
"toolUserPassword"
,
toolUserPassword
);
}
else
{
preferenceStore
.
setToDefault
(
"toolUserPassword"
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录