amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Improve output of database errors

Browse Source
This commit is contained in:
Eric 2019-07-22 16:07:30 +02:00
parent 67c55be518
commit e82c28e5e8
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/epiceric/shopchest/ShopChest.java
View File

@ -448,6 +448,8 @@ public class ShopChest extends JavaPlugin {
@Override @Override
public void onError(Throwable throwable) { public void onError(Throwable throwable) {
// Database connection probably failed => disable plugin to prevent more errors // Database connection probably failed => disable plugin to prevent more errors
getLogger().severe("No database access. Disabling ShopChest");
if (throwable != null) getLogger().severe(throwable.getMessage());
getServer().getPluginManager().disablePlugin(ShopChest.this); getServer().getPluginManager().disablePlugin(ShopChest.this);
} }
}); });

4
src/main/java/de/epiceric/shopchest/command/ShopCommandExecutor.java
View File

@ -204,7 +204,9 @@ class ShopCommandExecutor implements CommandExecutor {
// Database connection probably failed => disable plugin to prevent more errors // Database connection probably failed => disable plugin to prevent more errors
sender.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, sender.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED,
new Replacement(Placeholder.ERROR, "No database access: Disabling ShopChest"))); new Replacement(Placeholder.ERROR, "No database access: Disabling ShopChest")));
Bukkit.getPluginManager().disablePlugin(plugin); plugin.getLogger().severe("No database access: Disabling ShopChest");
if (throwable != null) plugin.getLogger().severe(throwable.getMessage());
plugin.getServer().getPluginManager().disablePlugin(plugin);
} }
}); });
} }

8
src/main/java/de/epiceric/shopchest/listeners/ShopUpdateListener.java
View File

@ -4,7 +4,6 @@ import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.shop.Shop; import de.epiceric.shopchest.shop.Shop;
import de.epiceric.shopchest.utils.Callback; import de.epiceric.shopchest.utils.Callback;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -53,11 +52,9 @@ public class ShopUpdateListener implements Listener {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
// Wait till the chunk should have loaded on the client // Wait till the chunk should have loaded on the client
// Update IF worlds are different OR chunks are different (as many teleports are in same chunk)
if (!from.getWorld().getName().equals(to.getWorld().getName()) if (!from.getWorld().getName().equals(to.getWorld().getName())
|| from.getChunk().getX() != to.getChunk().getX() || from.getChunk().getX() != to.getChunk().getX()
|| from.getChunk().getZ() != to.getChunk().getZ()) { || from.getChunk().getZ() != to.getChunk().getZ()) {
// Wait for 15 ticks before we actually put it in the queue
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -71,7 +68,6 @@ public class ShopUpdateListener implements Listener {
shop.getHologram().hidePlayer(p); shop.getHologram().hidePlayer(p);
} }
} }
// so next update will update correctly
plugin.getShopUtils().resetPlayerLocation(p); plugin.getShopUtils().resetPlayerLocation(p);
} }
}); });
@ -100,7 +96,9 @@ public class ShopUpdateListener implements Listener {
@Override @Override
public void onError(Throwable throwable) { public void onError(Throwable throwable) {
// Database connection probably failed => disable plugin to prevent more errors // Database connection probably failed => disable plugin to prevent more errors
Bukkit.getPluginManager().disablePlugin(plugin); plugin.getLogger().severe("No database access. Disabling ShopChest");
if (throwable != null) plugin.getLogger().severe(throwable.getMessage());
plugin.getServer().getPluginManager().disablePlugin(plugin);
} }
}); });
} }

13
src/main/java/de/epiceric/shopchest/sql/Database.java
View File

@ -255,10 +255,18 @@ public abstract class Database {
public void run() { public void run() {
disconnect(); disconnect();
dataSource = getDataSource(); try {
dataSource = getDataSource();
} catch (Exception e) {
callback.onError(e);
plugin.debug(e);
return;
}
if (dataSource == null) { if (dataSource == null) {
callback.onError(new SQLException("Failed to get data source")); Exception e = new IllegalStateException("Data source is null");
callback.onError(e);
plugin.debug(e);
return; return;
} }
@ -719,6 +727,7 @@ public abstract class Database {
public void disconnect() { public void disconnect() {
if (dataSource != null) { if (dataSource != null) {
dataSource.close(); dataSource.close();
dataSource = null;
} }
} }