From 0d3a422ee38acbeede2fbbfdebd975d3497498d9 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 2 Apr 2018 15:51:12 +0000 Subject: [PATCH] Addition of missing DatabaseFactory initialization message. --- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../java/com/l2jmobius/gameserver/GameServer.java | 1 - .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- .../l2jmobius/commons/database/DatabaseFactory.java | 10 ++++++---- 9 files changed, 48 insertions(+), 33 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseFactory.java index 2574c13646..44ba2fad76 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -87,6 +87,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -100,7 +102,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -114,7 +116,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java index 516c3cf33b..f0f9439f9b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java @@ -179,7 +179,6 @@ public class GameServer Util.printSection("Database"); DatabaseFactory.getInstance(); - LOGGER.info("Database: Initialized."); Util.printSection("ThreadPool"); ThreadPool.initThreadPools(new GameThreadPools()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java index 8a715456be..d76f869301 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/database/DatabaseFactory.java index 7f0126409e..68d02d4171 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -30,7 +30,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; */ public class DatabaseFactory { - private static final Logger _log = Logger.getLogger(DatabaseFactory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); private final ComboPooledDataSource _dataSource; @@ -39,7 +39,7 @@ public class DatabaseFactory if (Config.DATABASE_MAX_CONNECTIONS < 2) { Config.DATABASE_MAX_CONNECTIONS = 2; - _log.warning("A minimum of 2 connections are required."); + LOGGER.warning("A minimum of 2 connections are required."); } _dataSource = new ComboPooledDataSource(); @@ -92,6 +92,8 @@ public class DatabaseFactory { e.printStackTrace(); } + + LOGGER.info("Database: Initialized."); } public Connection getConnection() @@ -105,7 +107,7 @@ public class DatabaseFactory } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": Unable to get a connection: " + e.getMessage()); } } return con; @@ -119,7 +121,7 @@ public class DatabaseFactory } catch (Exception e) { - _log.info(e.getMessage()); + LOGGER.info(e.getMessage()); } }