mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
migrate from JUL to SLF4j
This commit is contained in:
1 parent
4ce891eb43
commit
0a951165e5
108 files changed
+688
-631
No files matched your search
@@ -5,14 +5,14 @@ import java.util.Collection;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebean.config.DataSourceConfig;
|
||||
import com.avaje.ebean.config.GlobalProperties;
|
||||
import com.avaje.ebeaninternal.api.ClassUtil;
|
||||
import com.avaje.ebeaninternal.server.lib.BackgroundRunnable;
|
||||
import com.avaje.ebeaninternal.server.lib.BackgroundThread;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
/**
|
||||
@@ -20,7 +20,7 @@ import com.avaje.ebeaninternal.server.lib.BackgroundThread;
|
||||
*/
|
||||
public class DataSourceManager implements DataSourceNotify {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(DataSourceManager.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(DataSourceManager.class);
|
||||
|
||||
/**
|
||||
* An alerter that notifies when the database has problems.
|
||||
@@ -76,7 +76,7 @@ public class DataSourceManager implements DataSourceNotify {
|
||||
BackgroundThread.add(dbChecker);
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ public class DataSourceManager implements DataSourceNotify {
|
||||
ds.shutdown();
|
||||
} catch (DataSourceException e) {
|
||||
// should never be thrown as the DataSources are all created...
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
}
|
||||
if (deregisterDriver){
|
||||
|
||||
@@ -11,14 +11,14 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.persistence.PersistenceException;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import com.avaje.ebean.config.DataSourceConfig;
|
||||
import com.avaje.ebeaninternal.api.ClassUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* A robust DataSource.
|
||||
@@ -36,7 +36,7 @@ import com.avaje.ebeaninternal.api.ClassUtil;
|
||||
*/
|
||||
public class DataSourcePool implements DataSource {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(DataSourcePool.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(DataSourcePool.class);
|
||||
|
||||
/**
|
||||
* The name given to this dataSource.
|
||||
@@ -206,8 +206,8 @@ public class DataSourcePool implements DataSource {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
||||
return logger;
|
||||
public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
||||
throw new SQLFeatureNotSupportedException("We do not support java.util.logging");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -293,7 +293,7 @@ public class DataSourcePool implements DataSource {
|
||||
if (!inWarningMode) {
|
||||
// send an Error to the event log...
|
||||
inWarningMode = true;
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
if (notify != null) {
|
||||
String subject = "DataSourcePool [" + name + "] warning";
|
||||
notify.notifyWarning(subject, msg);
|
||||
@@ -305,7 +305,7 @@ public class DataSourcePool implements DataSource {
|
||||
|
||||
if (!dataSourceDownAlertSent) {
|
||||
String msg = "FATAL: DataSourcePool [" + name + "] is down!!!";
|
||||
logger.log(Level.SEVERE, msg, ex);
|
||||
logger.error(msg, ex);
|
||||
if (notify != null) {
|
||||
notify.notifyDataSourceDown(name);
|
||||
}
|
||||
@@ -321,14 +321,14 @@ public class DataSourcePool implements DataSource {
|
||||
private void notifyDataSourceIsUp() {
|
||||
if (dataSourceDownAlertSent) {
|
||||
String msg = "RESOLVED FATAL: DataSourcePool [" + name + "] is back up!";
|
||||
logger.log(Level.SEVERE, msg);
|
||||
logger.error(msg);
|
||||
if (notify != null) {
|
||||
notify.notifyDataSourceUp(name);
|
||||
}
|
||||
dataSourceDownAlertSent = false;
|
||||
|
||||
} else if (!dataSourceUp) {
|
||||
logger.log(Level.WARNING, "DataSourcePool [" + name + "] is back up!");
|
||||
logger.warn("DataSourcePool [" + name + "] is back up!");
|
||||
}
|
||||
|
||||
if (!dataSourceUp) {
|
||||
@@ -362,7 +362,7 @@ public class DataSourcePool implements DataSource {
|
||||
conn.close();
|
||||
}
|
||||
} catch (SQLException ex) {
|
||||
logger.log(Level.WARNING, "Can't close connection in checkDataSource!");
|
||||
logger.warn("Can't close connection in checkDataSource!");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -487,14 +487,14 @@ public class DataSourcePool implements DataSource {
|
||||
rset.close();
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
try {
|
||||
if (stmt != null) {
|
||||
stmt.close();
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -515,7 +515,7 @@ public class DataSourcePool implements DataSource {
|
||||
|
||||
} catch (Exception e) {
|
||||
String desc = "heartbeatsql test failed on connection[" + conn.getName() + "]";
|
||||
logger.warning(desc);
|
||||
logger.warn(desc);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -806,10 +806,10 @@ public class DataSourcePool implements DataSource {
|
||||
try {
|
||||
DriverManager.deregisterDriver(DriverManager.getDriver(this.databaseUrl));
|
||||
String msg = "Deregistered the JDBC driver "+this.databaseDriver;
|
||||
logger.log(Level.FINE, msg);
|
||||
logger.debug(msg);
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error trying to deregister the JDBC driver "+this.databaseDriver;
|
||||
logger.log(Level.WARNING, msg, e);
|
||||
logger.warn(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@ import java.sql.Statement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebeaninternal.jdbc.ConnectionDelegator;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Is a connection that belongs to a DataSourcePool.
|
||||
@@ -37,7 +37,7 @@ import com.avaje.ebeaninternal.jdbc.ConnectionDelegator;
|
||||
public class PooledConnection extends ConnectionDelegator
|
||||
{
|
||||
|
||||
private static final Logger logger = Logger.getLogger(PooledConnection.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(PooledConnection.class);
|
||||
|
||||
private static String IDLE_CONNECTION_ACCESSED_ERROR = "Pooled Connection has been accessed whilst idle in the pool, via method: ";
|
||||
|
||||
@@ -263,13 +263,13 @@ public class PooledConnection extends ConnectionDelegator
|
||||
try {
|
||||
if (connection.isClosed()) {
|
||||
msg = "Closing Connection[" + getName() + "] that is already closed?";
|
||||
logger.log(Level.SEVERE, msg);
|
||||
logger.error(msg);
|
||||
return;
|
||||
}
|
||||
} catch (SQLException ex) {
|
||||
if (logErrors) {
|
||||
msg = "Error when fully closing connection [" + getName() + "]";
|
||||
logger.log(Level.SEVERE, msg, ex);
|
||||
logger.error(msg, ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,7 +282,7 @@ public class PooledConnection extends ConnectionDelegator
|
||||
|
||||
} catch (SQLException ex) {
|
||||
if (logErrors) {
|
||||
logger.log(Level.WARNING, "Error when closing connection Statements", ex);
|
||||
logger.warn("Error when closing connection Statements", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,7 +292,7 @@ public class PooledConnection extends ConnectionDelegator
|
||||
} catch (SQLException ex) {
|
||||
if (logErrors) {
|
||||
msg = "Error when fully closing connection [" + getName() + "]";
|
||||
logger.log(Level.SEVERE, msg, ex);
|
||||
logger.error(msg, ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -358,7 +358,7 @@ public class PooledConnection extends ConnectionDelegator
|
||||
pstmt.closeDestroy();
|
||||
|
||||
} catch (SQLException e) {
|
||||
logger.log(Level.SEVERE, "Error closing Pstmt", e);
|
||||
logger.error("Error closing Pstmt", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -535,11 +535,11 @@ public class PooledConnection extends ConnectionDelegator
|
||||
if (connection != null && !connection.isClosed()) {
|
||||
// connect leak?
|
||||
String msg = "Closing Connection[" + getName() + "] on finalize().";
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
closeConnectionFully(false);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
super.finalize();
|
||||
}
|
||||
@@ -580,8 +580,8 @@ public class PooledConnection extends ConnectionDelegator
|
||||
*/
|
||||
protected void setLastStatement(String lastStatement) {
|
||||
this.lastStatement = lastStatement;
|
||||
if (logger.isLoggable(Level.FINER)) {
|
||||
logger.finer(".setLastStatement[" + lastStatement + "]");
|
||||
if (logger.isTraceEnabled()) {
|
||||
logger.trace(".setLastStatement[" + lastStatement + "]");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@ import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.locks.Condition;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebeaninternal.server.lib.sql.DataSourcePool.Status;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class PooledConnectionQueue {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(PooledConnectionQueue.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(PooledConnectionQueue.class);
|
||||
|
||||
private static final TimeUnit MILLIS_TIME_UNIT = TimeUnit.MILLISECONDS;
|
||||
|
||||
@@ -203,7 +203,7 @@ public class PooledConnectionQueue {
|
||||
lock.lock();
|
||||
try {
|
||||
if (!busyList.remove(c)) {
|
||||
logger.log(Level.SEVERE, "Connection [" + c + "] not found in BusyList? ");
|
||||
logger.error("Connection [" + c + "] not found in BusyList? ");
|
||||
}
|
||||
if (c.getCreationTime() <= lastResetTime) {
|
||||
c.closeConnectionFully(false);
|
||||
@@ -339,7 +339,7 @@ public class PooledConnectionQueue {
|
||||
|
||||
if (!busyList.isEmpty()) {
|
||||
String msg = "A potential connection leak was detected. Busy connections: "+ busyList.size();
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
|
||||
dumpBusyConnectionInformation();
|
||||
closeBusyConnections(0);
|
||||
@@ -493,7 +493,7 @@ public class PooledConnectionQueue {
|
||||
+ pc.getName() + "] lastUsed[" + luDate + "] createdBy[" + methodLine
|
||||
+ "] lastStmt[" + pc.getLastStatement() + "]";
|
||||
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
logStackElement(pc, "Possible Leaked Connection: ");
|
||||
|
||||
System.out.println("CLOSING BUSY CONNECTION ??? "+pc);
|
||||
@@ -501,7 +501,7 @@ public class PooledConnectionQueue {
|
||||
|
||||
} catch (SQLException ex) {
|
||||
// this should never actually happen
|
||||
logger.log(Level.SEVERE, null, ex);
|
||||
logger.error(null, ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -510,7 +510,7 @@ public class PooledConnectionQueue {
|
||||
if (stackTrace != null){
|
||||
String s = Arrays.toString(stackTrace);
|
||||
String msg = prefix+" name["+pc.getName()+"] stackTrace: "+s;
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
// also send to syserr ... as the loggers get turned
|
||||
// off early in JVM shutdown
|
||||
System.err.println(msg);
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
package com.avaje.ebeaninternal.server.lib.sql;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Random;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* Security mechanisim.
|
||||
*/
|
||||
public class Prefix {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(Prefix.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(Prefix.class);
|
||||
|
||||
private static final int[] oa = { 50, 12, 4, 6, 8, 10, 7, 23, 45, 23, 6, 9, 12, 2, 8, 34 };
|
||||
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
package com.avaje.ebeaninternal.server.lib.sql;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* A LRU based cache for PreparedStatements.
|
||||
*/
|
||||
public class PstmtCache extends LinkedHashMap<String, ExtendedPreparedStatement> {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(PstmtCache.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(PstmtCache.class);
|
||||
|
||||
static final long serialVersionUID = -3096406924865550697L;
|
||||
|
||||
@@ -154,7 +155,7 @@ public class PstmtCache extends LinkedHashMap<String, ExtendedPreparedStatement>
|
||||
ExtendedPreparedStatement pstmt = eldest.getValue();
|
||||
pstmt.closeDestroy();
|
||||
} catch (SQLException e) {
|
||||
logger.log(Level.SEVERE, "Error closing ExtendedPreparedStatement", e);
|
||||
logger.error("Error closing ExtendedPreparedStatement", e);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.avaje.ebeaninternal.server.lib.sql;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebean.config.GlobalProperties;
|
||||
import com.avaje.ebeaninternal.server.lib.util.MailEvent;
|
||||
import com.avaje.ebeaninternal.server.lib.util.MailListener;
|
||||
import com.avaje.ebeaninternal.server.lib.util.MailMessage;
|
||||
import com.avaje.ebeaninternal.server.lib.util.MailSender;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* A simple smtp email alert that sends a email message
|
||||
@@ -21,7 +20,7 @@ import com.avaje.ebeaninternal.server.lib.util.MailSender;
|
||||
*/
|
||||
public class SimpleAlerter implements DataSourceAlertListener, MailListener {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(SimpleAlerter.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(SimpleAlerter.class);
|
||||
|
||||
//boolean sendInBackGround = true;
|
||||
|
||||
@@ -37,7 +36,7 @@ public class SimpleAlerter implements DataSourceAlertListener, MailListener {
|
||||
public void handleEvent(MailEvent event) {
|
||||
Throwable e = event.getError();
|
||||
if (e != null){
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
logger.error(null, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user