add more onFatalError info.

This commit is contained in:
wenshao
2017-11-21 16:55:00 +08:00
parent 3fb484aa88
commit 882470b1ce
6 changed files with 144 additions and 88 deletions
@@ -121,12 +121,16 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
}
public SQLException handleException(Throwable t) throws SQLException {
return handleException(t, null);
}
public SQLException handleException(Throwable t, String sql) throws SQLException {
final DruidConnectionHolder holder = this.holder;
//
if (holder != null) {
DruidAbstractDataSource dataSource = holder.getDataSource();
dataSource.handleConnectionException(this, t);
dataSource.handleConnectionException(this, t, sql);
}
if (t instanceof SQLException) {
@@ -151,7 +155,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
rawStatement.clearParameters();
} catch (SQLException ex) {
this.handleException(ex);
this.handleException(ex, null);
if (rawStatement.getConnection().isClosed()) {
return;
}
@@ -184,7 +188,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
//In this case, the exception is desired to be properly handled to remove the unusable connection from the pool.
stmt.closeInternal();
} catch (SQLException ex) {
this.handleException(ex);
this.handleException(ex, null);
throw ex;
} finally {
holder.getDataSource().incrementClosedPreparedStatementCount();
@@ -345,7 +349,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -384,7 +388,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
resultSetConcurrency));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -419,7 +423,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
resultSetHoldability));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -450,7 +454,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql, columnIndexes));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -481,7 +485,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql, columnNames));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -512,7 +516,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql, autoGeneratedKeys));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -545,7 +549,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
stmtHolder = new PreparedStatementHolder(key, conn.prepareCall(sql));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -580,7 +584,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
resultSetHoldability));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -613,7 +617,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
conn.prepareCall(sql, resultSetType, resultSetConcurrency));
holder.getDataSource().incrementPreparedStatementCount();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, sql);
}
}
@@ -635,7 +639,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
stmt = conn.createStatement();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
holder.getDataSource().initStatement(this, stmt);
@@ -655,7 +659,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
stmt = conn.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
holder.getDataSource().initStatement(this, stmt);
@@ -674,7 +678,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
stmt = conn.createStatement(resultSetType, resultSetConcurrency);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
holder.getDataSource().initStatement(this, stmt);
@@ -708,7 +712,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
conn.setAutoCommit(autoCommit);
holder.setUnderlyingAutoCommit(autoCommit);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
}
@@ -744,7 +748,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.commit();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
} finally {
handleEndTransaction(dataSource, null);
}
@@ -776,7 +780,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.rollback();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
} finally {
handleEndTransaction(dataSource, null);
}
@@ -789,7 +793,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
return conn.setSavepoint(name);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
return null; // never arrive
}
}
@@ -806,7 +810,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.rollback(savepoint);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
} finally {
handleEndTransaction(dataSource, savepoint);
}
@@ -831,7 +835,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.releaseSavepoint(savepoint);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
}
@@ -842,7 +846,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
return conn.createClob();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
return null; // never arrive
}
}
@@ -885,7 +889,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.setReadOnly(readOnly);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
holder.setUnderlyingReadOnly(readOnly);
@@ -905,7 +909,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.setCatalog(catalog);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
}
@@ -930,7 +934,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.setTransactionIsolation(level);
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
holder.setUnderlyingTransactionIsolation(level);
}
@@ -955,7 +959,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
conn.clearWarnings();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
}
}
@@ -1006,7 +1010,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
try {
return conn.setSavepoint();
} catch (SQLException ex) {
handleException(ex);
handleException(ex, null);
return null;
}
}