Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-10 09:21:31 +01:00
Code Issues Projects Releases Wiki Activity

Improved error handling when establishing a MongoDB connection

Browse Source 
Also improved the "error" messages when the credentials in the config are not correct.
This commit is contained in:
Florian CUNY 2019-10-19 22:57:19 +02:00
parent c67f1ac48b
commit 3fd92f05e8
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java
View File

@ -3,6 +3,8 @@ package world.bentobox.bentobox.database.mongodb;
import java.util.ArrayList;
import java.util.List;
import com.mongodb.MongoClientException;
import com.mongodb.MongoTimeoutException;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bukkit.Bukkit;
@ -48,16 +50,33 @@ public class MongoDBDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
super(plugin, type, dbConnecter);
this.dbConnecter = dbConnecter;
// Connection to the database
MongoDatabase database = (MongoDatabase) dbConnecter.createConnection(dataObject);
if (database == null) {
plugin.logError("Are the settings in config.yml correct?");
Bukkit.getPluginManager().disablePlugin(plugin);
return;
boolean connected = true; // if it is set to false, it will consider there has been an error upon connecting.
try {
// Connection to the database
MongoDatabase database = (MongoDatabase) dbConnecter.createConnection(dataObject);
if (database == null) {
plugin.logError("Could not connect to the database. Are the credentials in the config.yml file correct?");
connected = false;
} else {
collection = database.getCollection(dataObject.getCanonicalName());
IndexOptions indexOptions = new IndexOptions().unique(true);
collection.createIndex(Indexes.text(UNIQUEID), indexOptions);
}
} catch (MongoTimeoutException e) {
plugin.logError("Could not connect to the database. MongoDB timed out.");
plugin.logError("Error code: " + e.getCode());
plugin.logError("Errors: " + String.join(", ", e.getErrorLabels()));
connected = false;
} catch (MongoClientException e) {
plugin.logError("Could not connect to the database. An unhandled error occurred.");
plugin.logStacktrace(e);
connected = false;
}
if (!connected) {
plugin.logWarning("Disabling BentoBox...");
Bukkit.getPluginManager().disablePlugin(plugin);
}
collection = database.getCollection(dataObject.getCanonicalName());
IndexOptions indexOptions = new IndexOptions().unique(true);
collection.createIndex(Indexes.text(UNIQUEID), indexOptions);
}
@Override

3
src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseHandler.java
View File

@ -240,7 +240,8 @@ public class SQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
*/
public boolean setConnection(Connection connection) {
if (connection == null) {
plugin.logError("Are the settings in config.yml correct?");
plugin.logError("Could not connect to the database. Are the credentials in the config.yml file correct?");
plugin.logWarning("Disabling the plugin...");
Bukkit.getPluginManager().disablePlugin(plugin);
return false;
}