Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-09-27 06:42:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix sql-config-template, remove debug-log and add map-id to cli-filewatcher output

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-08-18 18:06:55 +02:00
parent eac01bb06e
commit 4c9b45e6eb
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/RegionFileWatchService.java
View File

@ -125,7 +125,7 @@ public void run() {
scheduledUpdates.remove(regionPos);
renderManager.scheduleRenderTask(task);
if (verbose) Logger.global.logInfo("Scheduled update for region-file: " + regionPos);
if (verbose) Logger.global.logInfo("Scheduled update for region-file: " + regionPos + " (Map: " + map.getId() + ")");
}
}
};

6
BlueMapCommon/src/main/resources/de/bluecolored/bluemap/config/storages/sql.conf
View File

@ -11,9 +11,9 @@ storage-type: SQL
# The JDBC-Connection URL that is used to connect to the database.
# The format for this url is usually something like: jdbc:[driver]://[host]:[port]/[database]?user=[user]&password=[password]
# The exact format of the url is determined by the JDBC-Driver you are using.
db-connection-url: "jdbc:mysql://localhost/bluemap?permitMysqlScheme"
#db-connection-url: "jdbc:mariadb://localhost/bluemap?user=root"
#db-connection-url: "jdbc:mysql://localhost:3306/bluemap?user=root&password=password"
connection-url: "jdbc:mysql://localhost/bluemap?permitMysqlScheme"
#connection-url: "jdbc:mariadb://localhost/bluemap?user=root"
#connection-url: "jdbc:mysql://localhost:3306/bluemap?user=root&password=password"
# This can be used to load a custom jdbc-driver from a .jar file.
# E.g. if your runtime-environment is not already providing the sql-driver you need,

2
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/SQLStorage.java
View File

@ -622,12 +622,10 @@ private int lookupFK(String table, String idField, String valueField, String val
}
private DataSource createDataSource(String dbUrl) {
Logger.global.logInfo("Creating datasource for: " + dbUrl);
return createDataSource(new DriverManagerConnectionFactory(dbUrl));
}
private DataSource createDataSource(String dbUrl, Driver driver) {
Logger.global.logInfo("Creating driver-datasource for: " + dbUrl);
ConnectionFactory connectionFactory = new DriverConnectionFactory(
driver,
dbUrl,