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

v10: fixes to the consumer thread

Browse Source
This commit is contained in:
bootswithdefer
2010-12-04 17:12:43 -07:00
parent 1224b148a8
commit 16bd1de41e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
LogBlock.java
View File

@ -16,7 +16,7 @@ import net.minecraft.server.MinecraftServer;
public class LogBlock extends Plugin public class LogBlock extends Plugin
{ {
private static String name = "LogBlock"; private static String name = "LogBlock";
private static int version = 9; private static int version = 10;
private boolean debug = false; private boolean debug = false;
private String dbDriver = "com.mysql.jdbc.Driver"; private String dbDriver = "com.mysql.jdbc.Driver";
private String dbUrl = ""; private String dbUrl = "";
@ -487,19 +487,25 @@ public class LogBlock extends Plugin
while (!stop) while (!stop)
{ {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis()/1000L;
int count = 0; int count = 0;
if (bqueue.size() > 100) if (bqueue.size() > 100)
log.info(name + " queue size " + bqueue.size()); log.info(name + " queue size " + bqueue.size());
// if (debug)
// lblog.info("Running DB thread at " + start);
try { try {
conn = getConnection(); conn = getConnection();
conn.setAutoCommit(false); conn.setAutoCommit(false);
ps = conn.prepareStatement("INSERT INTO blocks (date, player, replaced, type, x, y, z) VALUES (now(),?,?,?,?,?,?)", Statement.RETURN_GENERATED_KEYS); ps = conn.prepareStatement("INSERT INTO blocks (date, player, replaced, type, x, y, z) VALUES (now(),?,?,?,?,?,?)", Statement.RETURN_GENERATED_KEYS);
while (count < 100 && start+delay > (System.currentTimeMillis()/1000F)) while (count < 100 && start+delay > (System.currentTimeMillis()/1000L))
{ {
// if (debug)
// lblog.info("Loop DB thread at " + (System.currentTimeMillis()/1000L));
b = bqueue.poll(1L, TimeUnit.SECONDS); b = bqueue.poll(1L, TimeUnit.SECONDS);
if (b == null) if (b == null)
continue; continue;
@ -513,7 +519,8 @@ public class LogBlock extends Plugin
ps.executeUpdate(); ps.executeUpdate();
count++; count++;
} }
if (debug && count > 0)
lblog.info("Commiting " + count + " inserts.");
conn.commit(); conn.commit();
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
log.log(Level.SEVERE, name + " interrupted exception", ex); log.log(Level.SEVERE, name + " interrupted exception", ex);