Small improvement to logging

Author: rbygrave

ebean-datasource/src/main/java/io/ebean/datasource/pool/BusyConnectionBuffer.java

@@ -106,7 +106,7 @@ void closeBusyConnections(long leakTimeMinutes) {
 
   private void closeBusyConnection(PooledConnection pc) {
     try {
-      Log.warn("DataSourcePool closing busy connection? {0}", pc.fullDescription());
+      Log.warn("DataSource closing busy connection? {0}", pc.fullDescription());
       System.out.println("CLOSING busy connection: " + pc.fullDescription());
       pc.closeConnectionFully(false);
     } catch (Exception ex) {

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -11,6 +11,8 @@
 import java.util.concurrent.atomic.LongAdder;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static io.ebean.datasource.pool.TransactionIsolation.description;
+
 /**
  * A robust DataSource implementation.
  * <ul>
@@ -225,13 +227,8 @@ private void initialiseConnections() throws SQLException {
       tryEnsureMinimumConnections();
     }
     startHeartBeatIfStopped();
-    String msg = "DataSourcePool [" + name +
-        "] autoCommit[" + autoCommit +
-        "] transIsolation[" + TransactionIsolation.getDescription(transactionIsolation) +
-        "] min[" + minConnections +
-        "] max[" + maxConnections +
-        "] in[" + (System.currentTimeMillis() - start) + "ms]";
-    Log.info(msg);
+    Log.info("DataSource [{0}] autoCommit[{1}] transIsolation[{2}] min[{3}] max[{4}] in[{5}ms]",
+      name, autoCommit, description(transactionIsolation), minConnections, maxConnections, (System.currentTimeMillis() - start));
   }
 
   /**
@@ -336,7 +333,7 @@ private void notifyDown(SQLException reason) {
         // check and set false immediately so that we only alert once
         dataSourceUp.set(false);
         dataSourceDownReason = reason;
-        Log.error("FATAL: DataSourcePool [" + name + "] is down or has network error!!!", reason);
+        Log.error("FATAL: DataSource [" + name + "] is down or has network error!!!", reason);
         if (notify != null) {
           notify.dataSourceDown(this, reason);
         }
@@ -361,12 +358,12 @@ private void notifyUp() {
         dataSourceUp.set(true);
         startHeartBeatIfStopped();
         dataSourceDownReason = null;
-        Log.error("RESOLVED FATAL: DataSourcePool [" + name + "] is back up!");
+        Log.error("RESOLVED FATAL: DataSource [" + name + "] is back up!");
         if (notify != null) {
           notify.dataSourceUp(this);
         }
       } else {
-        Log.info("DataSourcePool [{0}] is back up!", name);
+        Log.info("DataSource [{0}] is back up!", name);
       }
     } finally {
       notifyLock.unlock();
@@ -620,7 +617,7 @@ private void returnTheConnection(PooledConnection pooledConnection, boolean forc
 
   void returnConnectionReset(PooledConnection pooledConnection) {
     queue.returnPooledConnection(pooledConnection, true);
-    Log.warn("Resetting DataSourcePool on read-only failure [{0}]", name);
+    Log.warn("Resetting DataSource on read-only failure [{0}]", name);
     reset();
   }
 
@@ -701,7 +698,7 @@ public void offline() {
   private void shutdownPool(boolean closeBusyConnections) {
     stopHeartBeatIfRunning();
     PoolStatus status = queue.shutdown(closeBusyConnections);
-    Log.info("DataSourcePool [{0}] shutdown {1}  psc[hit:{2} miss:{3} put:{4} rem:{5}]", name, status, pscHit, pscMiss, pscPut, pscRem);
+    Log.info("DataSource [{0}] shutdown {1}  psc[hit:{2} miss:{3} put:{4} rem:{5}]", name, status, pscHit, pscMiss, pscPut, pscRem);
     dataSourceUp.set(false);
   }
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnectionQueue.java

@@ -234,7 +234,7 @@ private PooledConnection _obtainConnection() throws InterruptedException, SQLExc
           PooledConnection c = pool.createConnectionForQueue(connectionId++);
           int busySize = registerBusyConnection(c);
           if (Log.isLoggable(Level.DEBUG)) {
-            Log.debug("DataSourcePool [{0}] grow; id[{1}] busy[{2}] max[{3}]", name, c.name(), busySize, maxSize);
+            Log.debug("DataSource [{0}] grow; id[{1}] busy[{2}] max[{3}]", name, c.name(), busySize, maxSize);
           }
           checkForWarningSize();
           return c;
@@ -318,7 +318,7 @@ void reset(long leakTimeMinutes) {
     lock.lock();
     try {
       PoolStatus status = createStatus();
-      Log.info("Resetting DataSourcePool [{0}] {1}", name, status);
+      Log.info("Resetting DataSource [{0}] {1}", name, status);
       lastResetTime = System.currentTimeMillis();
 
       closeFreeConnections(false);
@@ -358,7 +358,7 @@ private int trimInactiveConnections(long maxInactiveMillis, long maxAgeMillis) {
 
     int trimmedCount = freeList.trim(usedSince, createdSince);
     if (trimmedCount > 0) {
-      Log.debug("DataSourcePool [{0}] trimmed [{1}] inactive connections. New size[{2}]", name, trimmedCount, totalConnections());
+      Log.debug("DataSource [{0}] trimmed [{1}] inactive connections. New size[{2}]", name, trimmedCount, totalConnections());
     }
     return trimmedCount;
   }
@@ -407,7 +407,7 @@ private void checkForWarningSize() {
     int availableGrowth = (maxSize - totalConnections());
     if (availableGrowth < warningSize) {
       closeBusyConnections(leakTimeMinutes);
-      pool.notifyWarning("DataSourcePool [" + name + "] is [" + availableGrowth + "] connections from its maximum size.");
+      pool.notifyWarning("DataSource [" + name + "] is [" + availableGrowth + "] connections from its maximum size.");
     }
   }
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/TransactionIsolation.java

@@ -10,7 +10,7 @@ final class TransactionIsolation {
   /**
    * Return the string description of the transaction isolation level specified.
    */
-  static String getDescription(int level) {
+  static String description(int level) {
     switch (level) {
       case Connection.TRANSACTION_NONE:
         return "NONE";