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

Fixed queue dump imports to not crash after a single error

Browse Source
This commit is contained in:
Robin Kupper
2011-10-17 15:24:54 +02:00
parent 17f3d5eba8
commit 9e4f058d92
2 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,11 @@ package de.diddiz.LogBlock;
import static de.diddiz.util.Utils.download;
import static org.bukkit.Bukkit.getLogger;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.FileWriter;
import java.net.URL;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -30,6 +31,8 @@ import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;
import de.diddiz.LogBlock.QueryParams.BlockChangeType;
import de.diddiz.util.MySQLConnectionPool;
import de.diddiz.util.Utils;
import de.diddiz.util.Utils.ExtensionFilenameFilter;
public class LogBlock extends JavaPlugin
{
@@ -77,12 +80,17 @@ public class LogBlock extends JavaPlugin
if (updater.update())
config = new Config(this);
updater.checkTables();
final File[] imports = new File("plugins/LogBlock/import/").listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(".sql");
doImports();
} catch (final Exception ex) {
getLogger().log(Level.SEVERE, "[LogBlock] Error while loading: ", ex);
errorAtLoading = true;
return;
}
});
consumer = new Consumer(this);
}
private void doImports() {
final File[] imports = new File("plugins/LogBlock/import/").listFiles(new ExtensionFilenameFilter("sql"));
if (imports != null && imports.length > 0) {
getLogger().info("[LogBlock] Found " + imports.length + " imports.");
Connection conn = null;
@@ -90,37 +98,38 @@ public class LogBlock extends JavaPlugin
conn = getConnection();
conn.setAutoCommit(false);
final Statement st = conn.createStatement();
for (final File sqlFile : imports)
try {
final BufferedWriter writer = new BufferedWriter(new FileWriter(new File(getDataFolder(), "import/failed.txt")));
int successes = 0, errors = 0;
for (final File sqlFile : imports) {
getLogger().info("[LogBlock] Trying to import " + sqlFile.getName() + " ...");
final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
String line = null;
while ((line = reader.readLine()) != null)
st.addBatch(line);
st.executeBatch();
try {
st.execute(line);
successes++;
} catch (final Exception ex) {
getLogger().warning("[LogBlock] Error while importing: '" + line + "': " + ex.getMessage());
writer.write(line + Utils.newline);
errors++;
}
conn.commit();
reader.close();
sqlFile.delete();
getLogger().info("[LogBlock] Successfully imported " + sqlFile.getName() + ".");
} catch (final Exception ex) {
getLogger().log(Level.WARNING, "[LogBlock] Failed to import " + sqlFile.getName() + ": ", ex);
file.renameTo(new File("plugins/LogBlock/import/" + sqlFile.getName() + ".failed"));
}
writer.close();
st.close();
getLogger().info("[LogBlock] Successfully imported stored queue.");
getLogger().info("[LogBlock] Successfully imported stored queue. (" + successes + " rows imported, " + errors + " errors)");
} catch (final Exception ex) {
getLogger().log(Level.WARNING, "[LogBlock] Error while importing: ", ex);
} finally {
if (conn != null)
try {
conn.close();
} catch (final SQLException ex) {}
}
}
} catch (final Exception ex) {
getLogger().log(Level.SEVERE, "[LogBlock] Error while loading: ", ex);
errorAtLoading = true;
return;
}
consumer = new Consumer(this);
}
@Override

17
src/de/diddiz/util/Utils.java
View File

@@ -4,6 +4,7 @@ import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -15,6 +16,8 @@ import java.util.logging.Logger;
public class Utils
{
public static String newline = System.getProperty("line.separator");
public static void download(Logger log, URL url, File file) throws IOException {
if (!file.getParentFile().exists())
file.getParentFile().mkdir();
@@ -141,4 +144,18 @@ public class Utils
buffer.append(delimiter).append(s[i]);
return buffer.toString();
}
public static class ExtensionFilenameFilter implements FilenameFilter
{
private final String ext;
public ExtensionFilenameFilter(String ext) {
this.ext = ext;
}
@Override
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(ext);
}
}
}