Commit 5d636bcc authored by wenmo's avatar wenmo

数据源执行ERROR全部打印

parent b159bb5f
......@@ -23,6 +23,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package com.dlink.utils;
import com.sun.org.slf4j.internal.Logger;
import com.sun.org.slf4j.internal.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.PrintWriter;
import java.io.StringWriter;
......
......@@ -13,6 +13,7 @@ import com.dlink.model.Column;
import com.dlink.model.Schema;
import com.dlink.model.Table;
import com.dlink.result.SqlExplainResult;
import com.dlink.utils.LogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -298,7 +299,7 @@ public abstract class AbstractJdbcDriver extends AbstractDriver {
}
result.setSuccess(true);
} catch (Exception e) {
result.setError(e.getMessage());
result.setError(LogUtil.getError(e));
result.setSuccess(false);
} finally {
close(preparedStatement, results);
......@@ -320,20 +321,18 @@ public abstract class AbstractJdbcDriver extends AbstractDriver {
try {
resList.add(executeUpdate(item.toString()));
} catch (Exception e) {
e.printStackTrace();
resList.add(0);
result.setStatusList(resList);
result.error(e.getMessage());
result.error(LogUtil.getError(e));
return result;
}
}else {
try {
resList.add(execute(item.toString()));
} catch (Exception e) {
e.printStackTrace();
resList.add(false);
result.setStatusList(resList);
result.error(e.getMessage());
result.error(LogUtil.getError(e));
return result;
}
}
......@@ -355,7 +354,7 @@ public abstract class AbstractJdbcDriver extends AbstractDriver {
sqlExplainResults.add(SqlExplainResult.success(type, current, null));
}
} catch (Exception e) {
sqlExplainResults.add(SqlExplainResult.fail(current,e.getMessage()));
sqlExplainResults.add(SqlExplainResult.fail(current,LogUtil.getError(e)));
} finally {
return sqlExplainResults;
}
......
......@@ -15,6 +15,7 @@ import com.dlink.metadata.query.ClickHouseQuery;
import com.dlink.metadata.query.IDBQuery;
import com.dlink.model.Table;
import com.dlink.result.SqlExplainResult;
import com.dlink.utils.LogUtil;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
......@@ -128,8 +129,7 @@ public class ClickHouseDriver extends AbstractJdbcDriver {
sqlExplainResults.add(SqlExplainResult.success(type, current, explain.toString()));
}
} catch (Exception e) {
e.printStackTrace();
sqlExplainResults.add(SqlExplainResult.fail(current, e.getMessage()));
sqlExplainResults.add(SqlExplainResult.fail(current, LogUtil.getError(e)));
} finally {
close(preparedStatement, results);
return sqlExplainResults;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment