Rainnny/minecraft-helper
1
0
Fork 0
forked from MinecraftUtilities/Backend
Code Pull Requests Activity

don't return maxmind data if it failed to load

Browse Source
This commit is contained in:
Lee 2024-04-21 23:33:40 +01:00
parent 2ad5556041
commit 67efda71d2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/xyz/mcutils/backend/model/server/MinecraftServer.java
View File

@ -191,6 +191,9 @@ public class MinecraftServer {
* @return the location of the server * @return the location of the server
*/ */
public static GeoLocation fromMaxMind(CityResponse response) { public static GeoLocation fromMaxMind(CityResponse response) {
if (response == null) {
return null;
}
return new GeoLocation( return new GeoLocation(
response.getCountry().getName(), response.getCountry().getName(),
response.getMostSpecificSubdivision().getName(), response.getMostSpecificSubdivision().getName(),

7
src/main/java/xyz/mcutils/backend/service/MaxMindService.java
View File

@ -40,8 +40,8 @@ public class MaxMindService {
public MaxMindService(@Value("${maxmind.license}") String maxMindLicense) { public MaxMindService(@Value("${maxmind.license}") String maxMindLicense) {
this.maxMindLicense = maxMindLicense; this.maxMindLicense = maxMindLicense;
if (maxMindLicense.isBlank()) { if (maxMindLicense.isBlank()) {
log.error("The MaxMind license key is not set, please set it in the configuration and try again"); log.error("The MaxMind license key is not set, please set it in the configuration and try again, disabling the MaxMind service...");
System.exit(1); return;
} }
File databaseFile = loadDatabase(); File databaseFile = loadDatabase();
@ -61,6 +61,9 @@ public class MaxMindService {
* @return The GeoIP information * @return The GeoIP information
*/ */
public static CityResponse lookup(String query) { public static CityResponse lookup(String query) {
if (database == null) { // The database isn't loaded, return null
return null;
}
try { try {
return database.city(InetAddress.getByName(query)); return database.city(InetAddress.getByName(query));
} catch (IOException | GeoIp2Exception e) { } catch (IOException | GeoIp2Exception e) {