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

Merge pull request #3477 from stormboomer/StormBoomer-Test1

Browse Source 
Add requested Feature to check for MySQL Connector
This commit is contained in:
mikeprimm 2021-09-07 22:08:06 -05:00 committed by GitHub
commit 56a683b4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,19 +292,27 @@ public class MySQLMapStorage extends MapStorage {
connectionString = "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags; connectionString = "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags;
Log.info("Opening MySQL database " + hostname + ":" + port + "/" + database + " as map store"); Log.info("Opening MySQL database " + hostname + ":" + port + "/" + database + " as map store");
try {
Class.forName("com.mysql.jdbc.Driver"); if(!hasClass("com.mysql.cj.jdbc.Driver") && !hasClass("com.mysql.jdbc.Driver")){
// Initialize/update tables, if needed
if(!initializeTables()) {
return false;
}
} catch (ClassNotFoundException cnfx) {
Log.severe("MySQL-JDBC classes not found - MySQL data source not usable"); Log.severe("MySQL-JDBC classes not found - MySQL data source not usable");
return false; return false;
} }
// Initialize/update tables, if needed
if(!initializeTables()) {
return false;
}
return writeConfigPHP(core); return writeConfigPHP(core);
} }
private boolean hasClass(String classname){
try{
Class.forName(classname);
return true;
} catch (ClassNotFoundException cnfx){
return false;
}
}
private boolean writeConfigPHP(DynmapCore core) { private boolean writeConfigPHP(DynmapCore core) {
File cfgfile = new File(baseStandaloneDir, "MySQL_config.php"); File cfgfile = new File(baseStandaloneDir, "MySQL_config.php");
if (!core.isInternalWebServerDisabled) { // If using internal server if (!core.isInternalWebServerDisabled) { // If using internal server