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

Use constants for magic values

Browse Source
This commit is contained in:
Brokkonaut
2018-12-08 18:04:36 +01:00
parent 71527530f2
commit 9f8fd3e1ca
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@@ -54,6 +54,10 @@ import de.diddiz.LogBlock.events.BlockChangePreLogEvent;
import de.diddiz.util.Utils; import de.diddiz.util.Utils;
public class Consumer extends Thread { public class Consumer extends Thread {
private static final int MAX_SHUTDOWN_TIME_MILLIS = 20000;
private static final int WAIT_FOR_CONNECTION_TIME_MILLIS = 10000;
private static final int RETRIES_ON_UNKNOWN_CONNECTION_ERROR = 2;
private final Deque<Row> queue = new ArrayDeque<Row>(); private final Deque<Row> queue = new ArrayDeque<Row>();
private final LogBlock logblock; private final LogBlock logblock;
private final Map<Actor, Integer> playerIds = new HashMap<>(); private final Map<Actor, Integer> playerIds = new HashMap<>();
@@ -448,7 +452,7 @@ public class Consumer extends Thread {
// wait for a connection // wait for a connection
logblock.getLogger().severe("[Consumer] Could not connect to the database!"); logblock.getLogger().severe("[Consumer] Could not connect to the database!");
try { try {
Thread.sleep(10000); Thread.sleep(WAIT_FOR_CONNECTION_TIME_MILLIS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
// ignore // ignore
} }
@@ -460,7 +464,7 @@ public class Consumer extends Thread {
synchronized (queue) { synchronized (queue) {
if (shutdown) { if (shutdown) {
// Give this thread some time to process the remaining entries // Give this thread some time to process the remaining entries
if (queue.isEmpty() || System.currentTimeMillis() - shutdownInitialized > 20000) { if (queue.isEmpty() || System.currentTimeMillis() - shutdownInitialized > MAX_SHUTDOWN_TIME_MILLIS) {
if (currentRows.isEmpty()) { if (currentRows.isEmpty()) {
break; break;
} else { } else {
@@ -505,7 +509,7 @@ public class Consumer extends Thread {
lastCommitsFailed = 0; lastCommitsFailed = 0;
} }
} catch (Exception e) { } catch (Exception e) {
boolean retry = lastCommitsFailed < 2; boolean retry = lastCommitsFailed < RETRIES_ON_UNKNOWN_CONNECTION_ERROR;
String state = "unknown"; String state = "unknown";
if (e instanceof SQLException) { if (e instanceof SQLException) {
// Retry on network errors: SQLSTATE = 08S01 08001 08004 HY000 40001 // Retry on network errors: SQLSTATE = 08S01 08001 08004 HY000 40001