feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Added message when started without database.

Browse Source
This commit is contained in:
Robin Kupper
2011-10-18 11:22:16 +02:00
parent a93475772e
commit f35e461666
1 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/de/diddiz/LogBlock/LogBlock.java
View File

@@ -19,7 +19,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Timer; import java.util.Timer;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Priority;
@@ -43,7 +45,7 @@ public class LogBlock extends JavaPlugin
private Updater updater = null; private Updater updater = null;
private Timer timer = null; private Timer timer = null;
private PermissionHandler permissions = null; private PermissionHandler permissions = null;
private boolean errorAtLoading = false, connected = true; private boolean errorAtLoading = false, noDb = false, connected = true;
private final Map<String, Session> sessions = new HashMap<String, Session>(); private final Map<String, Session> sessions = new HashMap<String, Session>();
public Config getLBConfig() { public Config getLBConfig() {
@@ -77,8 +79,10 @@ public class LogBlock extends JavaPlugin
getLogger().info("[LogBlock] Connecting to " + config.user + "@" + config.url + "..."); getLogger().info("[LogBlock] Connecting to " + config.user + "@" + config.url + "...");
pool = new MySQLConnectionPool(config.url, config.user, config.password); pool = new MySQLConnectionPool(config.url, config.user, config.password);
final Connection conn = getConnection(); final Connection conn = getConnection();
if (conn == null) if (conn == null) {
throw new SQLException("No MySQL connection"); noDb = true;
return;
}
conn.close(); conn.close();
if (updater.update()) if (updater.update())
config = new Config(this); config = new Config(this);
@@ -142,6 +146,8 @@ public class LogBlock extends JavaPlugin
pm.disablePlugin(this); pm.disablePlugin(this);
return; return;
} }
if (noDb)
return;
if (pm.getPlugin("WorldEdit") == null && !new File("lib/WorldEdit.jar").exists() && !new File("WorldEdit.jar").exists()) if (pm.getPlugin("WorldEdit") == null && !new File("lib/WorldEdit.jar").exists() && !new File("WorldEdit.jar").exists())
try { try {
download(getLogger(), new URL("http://diddiz.insane-architects.net/download/WorldEdit.jar"), new File("lib/WorldEdit.jar")); download(getLogger(), new URL("http://diddiz.insane-architects.net/download/WorldEdit.jar"), new File("lib/WorldEdit.jar"));
@@ -263,10 +269,11 @@ public class LogBlock extends JavaPlugin
if (timer != null) if (timer != null)
timer.cancel(); timer.cancel();
getServer().getScheduler().cancelTasks(this); getServer().getScheduler().cancelTasks(this);
if (consumer != null) {
if (config.logPlayerInfo && getServer().getOnlinePlayers() != null) if (config.logPlayerInfo && getServer().getOnlinePlayers() != null)
for (final Player player : getServer().getOnlinePlayers()) for (final Player player : getServer().getOnlinePlayers())
consumer.queueLeave(player); consumer.queueLeave(player);
if (consumer != null && consumer.getQueueSize() > 0) { if (consumer.getQueueSize() > 0) {
getLogger().info("[LogBlock] Waiting for consumer ..."); getLogger().info("[LogBlock] Waiting for consumer ...");
int lastSize = -1, fails = 0; int lastSize = -1, fails = 0;
while (consumer.getQueueSize() > 0) { while (consumer.getQueueSize() > 0) {
@@ -289,11 +296,19 @@ public class LogBlock extends JavaPlugin
consumer.run(); consumer.run();
} }
} }
}
if (pool != null) if (pool != null)
pool.close(); pool.close();
getLogger().info("LogBlock disabled."); getLogger().info("LogBlock disabled.");
} }
@Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
if (noDb)
sender.sendMessage(ChatColor.RED + "No database connected. Check your MySQL user/pw and database for typos. Start/restart your MySQL server.");
return true;
}
boolean hasPermission(CommandSender sender, String permission) { boolean hasPermission(CommandSender sender, String permission) {
if (permissions != null && sender instanceof Player) if (permissions != null && sender instanceof Player)
return permissions.has((Player)sender, permission); return permissions.has((Player)sender, permission);