Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

补充出错信息

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@448 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-15 09:25:32 +00:00
parent c4a986415a
commit 777832ac03
9 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/jconsole/ConnectionsPanel.java
+5 -1
View File
@@ -10,7 +10,11 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
public class ConnectionsPanel extends JPanel {
private final static Log LOG = LogFactory.getLog(ConnectionsPanel.class);
private static final long serialVersionUID = 1L;
@@ -61,7 +65,7 @@ public class ConnectionsPanel extends JPanel {
this.setLayout(new BorderLayout());
this.add(tableScrollPane, BorderLayout.CENTER);
} catch (Exception e) {
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
src/main/java/com/alibaba/druid/jconsole/DruidPanel.java
+5 -2
View File
@@ -30,12 +30,15 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeSelectionModel;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.stat.JdbcStatManager;
import com.sun.tools.jconsole.JConsoleContext;
public class DruidPanel extends JPanel {
private final static Log LOG = LogFactory.getLog(DruidPanel.class);
private static final long serialVersionUID = 1L;
protected JSplitPane mainSplit;
@@ -208,7 +211,7 @@ public class DruidPanel extends JPanel {
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
});
src/main/java/com/alibaba/druid/jconsole/SQLPanel.java
+7 -3
View File
@@ -25,8 +25,12 @@ import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;
public class SQLPanel extends JPanel {
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
public class SQLPanel extends JPanel {
private final static Log LOG = LogFactory.getLog(SQLPanel.class);
private static final long serialVersionUID = 1L;
private MBeanServerConnection connection;
@@ -108,7 +112,7 @@ public class SQLPanel extends JPanel {
this.setLayout(new BorderLayout());
this.add(tableScrollPane, BorderLayout.CENTER);
} catch (Exception e) {
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
@@ -159,7 +163,7 @@ public class SQLPanel extends JPanel {
tableModel.setRowData(rows);
tableModel.fireTableRowsInserted(0, rows.length);
} catch (Exception e) {
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
src/main/java/com/alibaba/druid/mock/MockDriver.java
+5 -1
View File
@@ -28,10 +28,14 @@ import java.sql.SQLXML;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;
import com.alibaba.druid.jconsole.SQLPanel;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.mock.handler.MockExecuteHandler;
import com.alibaba.druid.mock.handler.MySqlMockExecuteHandlerImpl;
public class MockDriver implements Driver {
private final static Log LOG = LogFactory.getLog(MockDriver.class);
public final static MockExecuteHandler DEFAULT_HANDLER = new MySqlMockExecuteHandlerImpl();
@@ -67,7 +71,7 @@ public class MockDriver implements Driver {
return true;
} catch (Exception e) {
e.printStackTrace();
LOG.error("registerDriver error", e);
}
return false;
src/main/java/com/alibaba/druid/pool/ConnectionHolder.java
+6 -2
View File
@@ -24,11 +24,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
import javax.sql.ConnectionEventListener;
import javax.sql.StatementEventListener;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
*/
public final class ConnectionHolder {
private final static Log LOG = LogFactory.getLog(ConnectionHolder.class);
private final DruidAbstractDataSource dataSource;
private final Connection conn;
private final List<ConnectionEventListener> connectionEventListeners = new CopyOnWriteArrayList<ConnectionEventListener>();
@@ -120,7 +124,7 @@ public final class ConnectionHolder {
stmt.close();
}
} catch (SQLException ex) {
ex.printStackTrace(); //
LOG.error("close statement error", ex);
}
}
statementTrace.clear();
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
-7
View File
@@ -601,13 +601,6 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
return logWriter;
}
protected void printStackTrace(Throwable e) {
if (logWriter != null) {
e.printStackTrace(logWriter);
logWriter.flush();
}
}
@Override
public void setLogWriter(PrintWriter out) throws SQLException {
this.logWriter = out;
src/main/java/com/alibaba/druid/pool/PoolableStatement.java
+6 -2
View File
@@ -24,11 +24,15 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
*/
public class PoolableStatement extends PoolableWrapper implements Statement {
private final static Log LOG = LogFactory.getLog(PoolableStatement.class);
private final Statement stmt;
protected PoolableConnection conn;
protected final List<ResultSet> resultSetTrace = new ArrayList<ResultSet>();
@@ -62,7 +66,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement {
rs.close();
}
} catch (SQLException ex) {
ex.printStackTrace(); //
LOG.error("clearResultSet error", ex);
}
}
resultSetTrace.clear();
src/main/java/com/alibaba/druid/proxy/DruidDriver.java
+6 -2
View File
@@ -29,6 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.PoolableStatement;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
import com.alibaba.druid.proxy.config.DruidFilterConfigLoader;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
@@ -43,7 +46,8 @@ import com.alibaba.druid.util.JdbcUtils;
* @author wenshao<szujobs@hotmail.com>
*/
public class DruidDriver implements Driver, DruidDriverMBean {
private final static Log LOG = LogFactory.getLog(DruidDriver.class);
private final static DruidDriver instance = new DruidDriver();
private final static ConcurrentMap<String, DataSourceProxyImpl> proxyDataSources = new ConcurrentHashMap<String, DataSourceProxyImpl>();
@@ -75,7 +79,7 @@ public class DruidDriver implements Driver, DruidDriverMBean {
return true;
} catch (Exception e) {
e.printStackTrace();
LOG.error("registerDriver error", e);
}
return false;
src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java
+7 -3
View File
@@ -21,6 +21,9 @@ import java.util.List;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterManager;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
/**
@@ -29,7 +32,8 @@ import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
* @author gang.su
*/
public class DruidLoaderUtils {
private final static Log LOG = LogFactory.getLog(DruidLoaderUtils.class);
public static void loadFilter(List<Filter> filterList, List<AbstractDruidFilterConfig> druidFilterConfigList) throws SQLException {
for (Iterator<AbstractDruidFilterConfig> iterator = druidFilterConfigList.iterator(); iterator.hasNext();) {
AbstractDruidFilterConfig druidFilterConfig = iterator.next();
@@ -131,7 +135,7 @@ public class DruidLoaderUtils {
try {
clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
} catch (ClassNotFoundException e) {
e.printStackTrace();
LOG.error("load class error", e);
}
if (clazz == null) {
@@ -149,7 +153,7 @@ public class DruidLoaderUtils {
try {
return Class.forName(className);
} catch (ClassNotFoundException e) {
e.printStackTrace();
// skip
}
return null;