Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-23 18:55:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2391 from aarroonn789/v3.0

Browse Source 
Added MySQL connection flags option "flags" in configuration.txt
This commit is contained in:
mikeprimm 2018-12-01 12:06:03 -06:00 committed by GitHub
commit 24c62e80ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DynmapCore/src/main/java/org/dynmap/storage/mysql/MySQLMapStorage.java
View File

@ -35,6 +35,7 @@ public class MySQLMapStorage extends MapStorage {
private String database;
private String hostname;
private String prefix = "";
private String flags;
private String tableTiles;
private String tableMaps;
private String tableFaces;
@ -278,6 +279,7 @@ public class MySQLMapStorage extends MapStorage {
userid = core.configuration.getString("storage/userid", "dynmap");
password = core.configuration.getString("storage/password", "dynmap");
prefix = core.configuration.getString("storage/prefix", "");
flags = core.configuration.getString("storage/flags", "?allowReconnect=true");
tableTiles = prefix + "Tiles";
tableMaps = prefix + "Maps";
tableFaces = prefix + "Faces";
@ -286,7 +288,7 @@ public class MySQLMapStorage extends MapStorage {
tableStandaloneFiles = prefix + "StandaloneFiles";
tableSchemaVersion = prefix + "SchemaVersion";
connectionString = "jdbc:mysql://" + hostname + ":" + port + "/" + database + "?allowReconnect=true";
connectionString = "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags;
Log.info("Opening MySQL database " + hostname + ":" + port + "/" + database + " as map store");
try {
Class.forName("com.mysql.jdbc.Driver");

3
spigot/src/main/resources/configuration.txt
View File

@ -25,7 +25,7 @@ storage:
# SQLite db for map storage (uses dbfile as storage location)
#type: sqlite
#dbfile: dynmap.db
# MySQL DB for map storage (at 'hostname':'port' in database 'database' using user 'userid' password 'password' and table prefix 'prefix'
# MySQL DB for map storage (at 'hostname':'port' with flags "flags" in database 'database' using user 'userid' password 'password' and table prefix 'prefix')
#type: mysql
#hostname: localhost
#port: 3306
@ -33,6 +33,7 @@ storage:
#userid: dynmap
#password: dynmap
#prefix: ""
#flags: "?allowReconnect=true"
components:
- class: org.dynmap.ClientConfigurationComponent