The-pack-family/APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad logic in MaxMind circuit breaker processor (no clue what I was thinking when I first wrote it)

Browse Source
This commit is contained in:
Colin McDonald 2016-08-16 22:58:06 -04:00
parent 831348b4f8
commit 2f60ce2aa7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java
View File

@ -50,15 +50,22 @@ public class MaxMindUtils {
try { try {
MaxMindResult maxMindResult = new MaxMindResult(bodyJson); MaxMindResult maxMindResult = new MaxMindResult(bodyJson);
future.complete(maxMindResult);
// we have to check !isComplete() because the circuit breaker's timeout might mark us as failed already
if (!future.isComplete()) {
future.complete(maxMindResult);
}
} catch (Exception ignored) { } catch (Exception ignored) {
future.complete(null); // we have to check !isComplete() because the circuit breaker's timeout might mark us as failed already
if (!future.isComplete()) {
future.complete(null);
}
} }
}); });
response.exceptionHandler((error) -> { response.exceptionHandler((error) -> {
// we have to check !failed because the circuit breaker's timeout will mark us as failed already // we have to check !isComplete() because the circuit breaker's timeout will might us as failed already
if (future.isComplete()) { if (!future.isComplete()) {
future.fail(error); future.fail(error);
} }
}); });