From 3610590d649bde2356c81b8a5f65095e3cd9b210 Mon Sep 17 00:00:00 2001 From: Nitin Date: Mon, 1 Feb 2016 20:28:33 +0530 Subject: [PATCH] poolName was missing in few logs --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index ec0c2a26..062db229 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -783,23 +783,23 @@ public class HikariConfig implements HikariConfigMXBean // Check Data Source Options if (dataSource != null) { if (dataSourceClassName != null) { - LOGGER.warn("using dataSource and ignoring dataSourceClassName"); + LOGGER.warn("{} - using dataSource and ignoring dataSourceClassName.", poolName); } } else if (dataSourceClassName != null) { if (driverClassName != null) { - LOGGER.error("cannot use driverClassName and dataSourceClassName together"); - throw new IllegalArgumentException("cannot use driverClassName and dataSourceClassName together"); + LOGGER.error("{} - cannot use driverClassName and dataSourceClassName together.", poolName); + throw new IllegalArgumentException("cannot use driverClassName and dataSourceClassName together."); } else if (jdbcUrl != null) { - LOGGER.warn("using dataSourceClassName and ignoring jdbcUrl"); + LOGGER.warn("{} - using dataSourceClassName and ignoring jdbcUrl.", poolName); } } else if (jdbcUrl != null) { } else if (driverClassName != null) { - LOGGER.error("jdbcUrl is required with driverClassName"); - throw new IllegalArgumentException("jdbcUrl is required with driverClassName"); + LOGGER.error("{} - jdbcUrl is required with driverClassName.", poolName); + throw new IllegalArgumentException("jdbcUrl is required with driverClassName."); } else { LOGGER.error("{} - dataSource or dataSourceClassName or jdbcUrl is required.", poolName);