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

Use MariaDB JDBC URL for connections.

Browse Source
This commit is contained in:
MobiusDev
2018-09-09 13:22:57 +00:00
parent 286697e77e
commit b75a4227d7
45 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
View File

@ -1155,7 +1155,7 @@ public final class Config
ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true);
DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver");
DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs");
DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs");
DATABASE_LOGIN = serverSettings.getString("Login", "root");
DATABASE_PASSWORD = serverSettings.getString("Password", "");
DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10);
@ -2733,7 +2733,7 @@ public final class Config
LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24);
DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver");
DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls");
DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls");
DATABASE_LOGIN = ServerSettings.getString("Login", "root");
DATABASE_PASSWORD = ServerSettings.getString("Password", "");
DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10);

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java
View File

@ -72,7 +72,7 @@ public class DatabaseBackup
final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : "";
try
{
final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date()));
final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date()));
process.waitFor();
}
catch (Exception e)

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java
View File

@ -36,7 +36,7 @@ public class MySqlConnect
try (Formatter form = new Formatter())
{
Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance();
final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString();
final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString();
con = DriverManager.getConnection(formattedText, user, password);
try (Statement s = con.createStatement())