From 980d8dc2e02436ea231a367199ee670e86f3ad44 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Tue, 6 Dec 2016 03:46:41 +0900
Subject: [PATCH] Fixed #781 Log before and after startup/shutdown.

---
 src/main/java/com/zaxxer/hikari/HikariDataSource.java | 10 +++++++---
 src/main/java/com/zaxxer/hikari/pool/HikariPool.java  |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 1fc7d05c..fa9ef748 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -67,8 +67,9 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
       configuration.validate();
       configuration.copyState(this);
 
-      LOGGER.info("{} - Started.", configuration.getPoolName());
+      LOGGER.info("{} - Starting...", configuration.getPoolName());
       pool = fastPathPool = new HikariPool(this);
+      LOGGER.info("{} - Start completed.", configuration.getPoolName());
    }
 
    /** {@inheritDoc} */
@@ -90,8 +91,9 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
             result = pool;
             if (result == null) {
                validate();
-               LOGGER.info("{} - Started.", getPoolName());
+               LOGGER.info("{} - Starting...", getPoolName());
                pool = result = new HikariPool(this);
+               LOGGER.info("{} - Start completed.", getPoolName());
             }
          }
       }
@@ -301,10 +303,12 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
       HikariPool p = pool;
       if (p != null) {
          try {
+            LOGGER.info("{} - Shutdown initiated...", getPoolName());
             p.shutdown();
+            LOGGER.info("{} - Shutdown completed.", getPoolName());
          }
          catch (InterruptedException e) {
-            LOGGER.warn("Interrupted during closing", e);
+            LOGGER.warn("{} - Interrupted during closing", getPoolName(), e);
             Thread.currentThread().interrupt();
          }
       }
diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 2a783fa9..33f594ba 100755
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -201,8 +201,7 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL
             return;
          }
 
-         LOGGER.info("{} - Close initiated...", poolName);
-         logPoolState("Before closing ");
+         logPoolState("Before shutdown ");
 
          if (houseKeeperTask != null) {
             houseKeeperTask.cancel(false);
@@ -240,10 +239,9 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL
          closeConnectionExecutor.awaitTermination(5L, SECONDS);
       }
       finally {
-         logPoolState("After closing ");
+         logPoolState("After shutdown ");
          unregisterMBeans();
          metricsTracker.close();
-         LOGGER.info("{} - Closed.", poolName);
       }
    }