diff --git a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java index bb78744b26..ae84969a80 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java @@ -24,11 +24,6 @@ import org.apache.commons.logging.impl.Log4JLogger; */ public class CommonsLogFilter extends LogFilter { - private String dataSourceLoggerName = "druid.sql.DataSource"; - private String connectionLoggerName = "druid.sql.Connection"; - private String statementLoggerName = "druid.sql.Statement"; - private String resultSetLoggerName = "druid.sql.ResultSet"; - private Log dataSourceLogger = LogFactory.getLog(dataSourceLoggerName); private Log connectionLogger = LogFactory.getLog(connectionLoggerName); private Log statementLogger = LogFactory.getLog(statementLoggerName); diff --git a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java index 88d6d7d2f3..d1bc1ec87f 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java @@ -23,15 +23,10 @@ import org.apache.log4j.Logger; */ public class Log4jFilter extends LogFilter implements Log4jFilterMBean { - private String dataSourceLoggerName = "druid.sql.DataSource"; - private String connectionLoggerName = "druid.sql.Connection"; - private String statementLoggerName = "druid.sql.Statement"; - private String resultSetLoggerName = "druid.sql.ResultSet"; - - private Logger dataSourceLogger = Logger.getLogger(dataSourceLoggerName); - private Logger connectionLogger = Logger.getLogger(connectionLoggerName); - private Logger statementLogger = Logger.getLogger(statementLoggerName); - private Logger resultSetLogger = Logger.getLogger(resultSetLoggerName); + private Logger dataSourceLogger = Logger.getLogger(dataSourceLoggerName); + private Logger connectionLogger = Logger.getLogger(connectionLoggerName); + private Logger statementLogger = Logger.getLogger(statementLoggerName); + private Logger resultSetLogger = Logger.getLogger(resultSetLoggerName); @Override public String getDataSourceLoggerName() { diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index 3617687d62..f695039ea4 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -37,6 +37,11 @@ import com.alibaba.druid.util.JdbcUtils; */ public abstract class LogFilter extends FilterEventAdapter implements LogFilterMBean { + protected String dataSourceLoggerName = "druid.sql.DataSource"; + protected String connectionLoggerName = "druid.sql.Connection"; + protected String statementLoggerName = "druid.sql.Statement"; + protected String resultSetLoggerName = "druid.sql.ResultSet"; + private boolean connectionConnectBeforeLogEnable = true; private boolean connectionConnectAfterLogEnable = true; private boolean connectionCommitAfterLogEnable = true; diff --git a/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java index 0863a55877..1357d696e5 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java @@ -5,15 +5,10 @@ import org.slf4j.LoggerFactory; public class Slf4jLogFilter extends LogFilter { - private String dataSourceLoggerName = "druid.sql.DataSource"; - private String connectionLoggerName = "druid.sql.Connection"; - private String statementLoggerName = "druid.sql.Statement"; - private String resultSetLoggerName = "druid.sql.ResultSet"; - - private Logger dataSourceLogger = LoggerFactory.getLogger(dataSourceLoggerName); - private Logger connectionLogger = LoggerFactory.getLogger(connectionLoggerName); - private Logger statementLogger = LoggerFactory.getLogger(statementLoggerName); - private Logger resultSetLogger = LoggerFactory.getLogger(resultSetLoggerName); + private Logger dataSourceLogger = LoggerFactory.getLogger(dataSourceLoggerName); + private Logger connectionLogger = LoggerFactory.getLogger(connectionLoggerName); + private Logger statementLogger = LoggerFactory.getLogger(statementLoggerName); + private Logger resultSetLogger = LoggerFactory.getLogger(resultSetLoggerName); @Override public String getDataSourceLoggerName() {