lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced HikariCP with MariaDB built-in pool.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-11 21:48:23 +00:00
parent 24c6ded75b
commit 7cef774939
209 changed files with 722 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java
View File

@ -19,33 +19,26 @@ package org.l2jmobius.commons.database;
import java.sql.Connection;
import java.util.logging.Logger;
import com.zaxxer.hikari.HikariDataSource;
import org.mariadb.jdbc.MariaDbPoolDataSource;
import org.l2jmobius.Config;
/**
* @author Mobius
* @version November 10th 2018
*/
public class DatabaseFactory
{
private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName());
private static final HikariDataSource _hds = new HikariDataSource();
private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60");
public static void init()
{
_hds.setDriverClassName(Config.DATABASE_DRIVER);
_hds.setJdbcUrl(Config.DATABASE_URL);
_hds.setUsername(Config.DATABASE_LOGIN);
_hds.setPassword(Config.DATABASE_PASSWORD);
_hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS);
_hds.setConnectionTimeout(600000);
_hds.setMaxLifetime(1200000);
// Test if connection is valid.
try
{
_hds.getConnection().close();
DATABASE_POOL.getConnection().close();
LOGGER.info("Database: Initialized.");
}
catch (Exception e)
@ -61,7 +54,7 @@ public class DatabaseFactory
{
try
{
con = _hds.getConnection();
con = DATABASE_POOL.getConnection();
}
catch (Exception e)
{
@ -75,7 +68,7 @@ public class DatabaseFactory
{
try
{
_hds.close();
DATABASE_POOL.close();
}
catch (Exception e)
{