diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini index 3208df4a19..214d549e19 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java index 7d94c62e3d..25cc57a932 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java @@ -726,7 +726,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1218,7 +1217,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2877,7 +2875,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini index a9d82359fb..86b2fbb816 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index 2e6f6e5f4b..fc3b04205e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -733,7 +733,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1225,7 +1224,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2893,7 +2891,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini index 45f530219a..61fd8179c2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index 5b865b7a8e..5bd2b5abe8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -734,7 +734,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1233,7 +1232,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2908,7 +2906,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini index a458bd3e8f..1b03497da3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index e7369a7354..643da6801e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -727,7 +727,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1226,7 +1225,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2894,7 +2892,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini index ba28ee2740..81e15032c8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini b/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index d38d2d9614..324e4d82c5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -722,7 +722,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1221,7 +1220,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2897,7 +2895,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini index 190db44a8b..e1abe5bb8d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini b/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java index d38d2d9614..324e4d82c5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java @@ -722,7 +722,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1221,7 +1220,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2897,7 +2895,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini index 130bec4905..845c571736 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini b/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini index 6e32e3b4f1..c17814d8dd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java index a2ffd29be0..8a4884dc81 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java @@ -723,7 +723,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1228,7 +1227,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2910,7 +2908,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/network/GameServer.ini b/L2J_Mobius_C6_Interlude/dist/game/config/network/GameServer.ini index 61aa7130e6..ba084ecc64 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/network/GameServer.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/network/GameServer.ini @@ -46,11 +46,8 @@ Login = root Password = # Attention: lazy init connections disabled! # Please, set only real values for your database -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini b/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini index dc673f69c3..471f4f499f 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini +++ b/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini @@ -59,9 +59,6 @@ Password = # maximum number of simultaneous connecting to the database MaximumDbConnections = 10 -# Default: 0 -MaximumDbIdleTime = 0 - # --------------------------------------------------------------------------- # Automatic Database Backup Settings diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index b63e4ea16c..72781bf2c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -210,7 +210,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1360,7 +1359,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getProperty("Login", "root"); DATABASE_PASSWORD = serverSettings.getProperty("Password", ""); DATABASE_MAX_CONNECTIONS = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10")); - DATABASE_MAX_IDLE_TIME = Integer.parseInt(serverSettings.getProperty("MaximumDbIdleTime", "0")); BACKUP_DATABASE = Boolean.valueOf(serverSettings.getProperty("BackupDatabase", "false")); MYSQL_BIN_PATH = serverSettings.getProperty("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -3792,7 +3790,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getProperty("Login", "root"); DATABASE_PASSWORD = serverSettings.getProperty("Password", ""); DATABASE_MAX_CONNECTIONS = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10")); - DATABASE_MAX_IDLE_TIME = Integer.parseInt(serverSettings.getProperty("MaximumDbIdleTime", "0")); BACKUP_DATABASE = Boolean.valueOf(serverSettings.getProperty("BackupDatabase", "false")); MYSQL_BIN_PATH = serverSettings.getProperty("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini index b3a51ce2f5..cdc51c5525 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini index e43ad724c7..65b4c65afa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java index 8df763ff31..1bcaf348ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java @@ -865,7 +865,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1390,7 +1389,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -3405,7 +3403,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini index 31421caf8c..af2f984215 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini index be7f25d0d6..950add6320 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index 46174b52d4..1e1232c7b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -731,7 +731,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1165,7 +1164,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2769,7 +2767,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini index b9b9a3a410..33a67648be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini index be7f25d0d6..950add6320 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java index af14a10105..ead19d926e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java @@ -731,7 +731,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1169,7 +1168,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2776,7 +2774,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini index d90f087b01..1a3737cac0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini index be7f25d0d6..950add6320 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java index af14a10105..ead19d926e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java @@ -731,7 +731,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1169,7 +1168,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2776,7 +2774,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini index 9e4dcc51b8..c47248f00f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 50 -MaximumDbConnections = 50 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 40 +MaximumDbConnections = 40 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini index be7f25d0d6..950add6320 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini @@ -50,11 +50,8 @@ Login = root # Database connection password Password = -# Default: 10 -MaximumDbConnections = 10 - -# Default: 0 -MaximumDbIdleTime = 0 +# Default: 5 +MaximumDbConnections = 5 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java index af14a10105..ead19d926e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java @@ -731,7 +731,6 @@ public final class Config public static String DATABASE_LOGIN; public static String DATABASE_PASSWORD; public static int DATABASE_MAX_CONNECTIONS; - public static int DATABASE_MAX_IDLE_TIME; public static boolean BACKUP_DATABASE; public static String MYSQL_BIN_PATH; public static String BACKUP_PATH; @@ -1169,7 +1168,6 @@ public final class Config DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = serverSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = serverSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); @@ -2776,7 +2774,6 @@ public final class Config DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); - DATABASE_MAX_IDLE_TIME = ServerSettings.getInt("MaximumDbIdleTime", 0); BACKUP_DATABASE = ServerSettings.getBoolean("BackupDatabase", false); MYSQL_BIN_PATH = ServerSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java index 0724058979..01814b45bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -39,7 +39,6 @@ public class DatabaseFactory _hds.setUsername(Config.DATABASE_LOGIN); _hds.setPassword(Config.DATABASE_PASSWORD); _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setIdleTimeout(Config.DATABASE_MAX_IDLE_TIME); _hds.setConnectionTimeout(600000); _hds.setIdleTimeout(1200000); _hds.setMaxLifetime(1200000);