From 7c52c10922295d147d759cc316c6190eac54fd8f Mon Sep 17 00:00:00 2001 From: Philip Cass Date: Sun, 22 Mar 2015 15:04:27 +0000 Subject: [PATCH] Use "count" var to determine how many rows have been processed --- src/main/java/de/diddiz/LogBlock/Consumer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java index a5ec74a..579f1d5 100644 --- a/src/main/java/de/diddiz/LogBlock/Consumer.java +++ b/src/main/java/de/diddiz/LogBlock/Consumer.java @@ -293,13 +293,14 @@ public class Consumer extends TimerTask getLogger().info("[Consumer] Queue overloaded. Size: " + getQueueSize()); } + int count = 0; + try { if (conn == null) return; conn.setAutoCommit(false); state = conn.createStatement(); final long start = System.currentTimeMillis(); - int count = 0; process: while (!queue.isEmpty() && (System.currentTimeMillis() - start < timePerRun || count < forceToProcessAtLeast)) { final Row r = queue.poll(); @@ -371,10 +372,9 @@ public class Consumer extends TimerTask if (debug) { long timeElapsed = System.currentTimeMillis() - startTime; - int rowsProcessed = startSize - queue.size(); - float rowPerTime = rowsProcessed / timeElapsed; + float rowPerTime = count / timeElapsed; getLogger().log(Level.INFO, "[Consumer] Finished consumer cycle in " + timeElapsed + " milliseconds."); - getLogger().log(Level.INFO, "[Consumer] Total rows processed: " + rowsProcessed + ". row/time: " + String.format("%.4f", rowPerTime)); + getLogger().log(Level.INFO, "[Consumer] Total rows processed: " + count + ". row/time: " + String.format("%.4f", rowPerTime)); } } }