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

Remove maxmind debug

Browse Source
This commit is contained in:
Colin McDonald 2016-06-27 22:14:51 -04:00
parent f1c9b3666e
commit 822dd27536
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/frozenorb/apiv3/model/IpIntel.java
View File

@ -16,7 +16,6 @@ import java.time.Instant;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@Slf4j
@Entity @Entity
@AllArgsConstructor @AllArgsConstructor
public final class IpIntel { public final class IpIntel {
@ -36,31 +35,22 @@ public final class IpIntel {
} }
public static void findOrCreateById(String id, SingleResultCallback<IpIntel> callback) { public static void findOrCreateById(String id, SingleResultCallback<IpIntel> callback) {
log.info("ip intel for " + id + " queried...");
findById(id, (existingIpIntel, error) -> { findById(id, (existingIpIntel, error) -> {
if (error != null) { if (error != null) {
log.info("ip intel for " + id + " db check failed");
callback.onResult(null, error); callback.onResult(null, error);
} else if (existingIpIntel != null) { } else if (existingIpIntel != null) {
log.info("ip intel for " + id + " found in db, returning that");
callback.onResult(existingIpIntel, null); callback.onResult(existingIpIntel, null);
} else { } else {
log.info("ip intel for " + id + " not found, calling maxmind");
MaxMindUtils.getInsights(id, (maxMindResult, error2) -> { MaxMindUtils.getInsights(id, (maxMindResult, error2) -> {
if (error2 != null) { if (error2 != null) {
log.info("ip intel for " + id + " maxmind query failed");
callback.onResult(null, error2); callback.onResult(null, error2);
} else { } else {
log.info("ip intel for " + id + " returned from maxmind, inserting");
IpIntel newIpIntel = new IpIntel(id, maxMindResult); IpIntel newIpIntel = new IpIntel(id, maxMindResult);
ipIntelCollection.insertOne(newIpIntel, (ignored, error3) -> { ipIntelCollection.insertOne(newIpIntel, (ignored, error3) -> {
if (error3 != null) { if (error3 != null) {
log.info("ip intel for " + id + " insertion failed");
callback.onResult(null, error3); callback.onResult(null, error3);
} else { } else {
log.info("ip intel for " + id + " insertion succeeded");
callback.onResult(newIpIntel, null); callback.onResult(newIpIntel, null);
} }
}); });

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

@ -23,8 +23,6 @@ public class MaxMindUtils {
public static void getInsights(String ip, SingleResultCallback<MaxMindResult> callback) { public static void getInsights(String ip, SingleResultCallback<MaxMindResult> callback) {
String authHeader = "Basic " + Base64.getEncoder().encodeToString((maxMindUserId + ":" + maxMindLicenseKey).getBytes(Charsets.UTF_8)); String authHeader = "Basic " + Base64.getEncoder().encodeToString((maxMindUserId + ":" + maxMindLicenseKey).getBytes(Charsets.UTF_8));
log.info("Requesting ip info for " + ip + " from MaxMind.");
httpsClient.get(443, "geoip.maxmind.com", "/geoip/v2.1/insights/" + ip, (response) -> { httpsClient.get(443, "geoip.maxmind.com", "/geoip/v2.1/insights/" + ip, (response) -> {
response.bodyHandler((body) -> { response.bodyHandler((body) -> {
JsonObject bodyJson = new JsonObject(body.toString()); JsonObject bodyJson = new JsonObject(body.toString());