Rainnny/RESTfulMC
1
0
Fork 0
Code Issues 1 Pull Requests 10 Actions Wiki Activity

Fallback to null for addr not found in MaxMind
All checks were successful
Deploy API / docker (17, 3.8.5) (push) Successful in 1m43s
Details

Browse Source
This commit is contained in:
Braydon 2024-04-24 15:42:44 -04:00
parent 43d1ea9ddd
commit f9bd49c4bb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
API/src/main/java/cc/restfulmc/api/service/MaxMindService.java
View File

@ -25,6 +25,7 @@ package cc.restfulmc.api.service;
import com.maxmind.db.CHMCache; import com.maxmind.db.CHMCache;
import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.exception.AddressNotFoundException;
import com.maxmind.geoip2.model.CityResponse; import com.maxmind.geoip2.model.CityResponse;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy; import jakarta.annotation.PreDestroy;
@ -113,7 +114,12 @@ public final class MaxMindService {
@SneakyThrows @SneakyThrows
public CityResponse lookupCity(@NonNull InetAddress address) { public CityResponse lookupCity(@NonNull InetAddress address) {
DatabaseReader database = getDatabase(Database.CITY); DatabaseReader database = getDatabase(Database.CITY);
return database == null ? null : database.city(address); try {
return database == null ? null : database.city(address);
} catch (AddressNotFoundException ignored) {
// Safely ignore this and return null instead
return null;
}
} }
/** /**