Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public void afterPropertiesSet() throws Exception {
}

public String createFeedsContent() {
log.info("Going to create feeds content.");
String[] feedsConfig = configurationService.getArrayProperty("discojuice.feeds");
String shibbolethDiscoFeedUrl = configurationService.getProperty("shibboleth.discofeed.url");

Expand Down Expand Up @@ -160,7 +161,7 @@ public String createFeedsContent() {
String old_country = (String)shibEntity.remove("country");
String new_country = guessCountry(shibEntity);
shibEntity.put("country", new_country);
log.info(String.format("For %s changed country from %s to %s", shibEntity.get("entityID"),
log.debug(String.format("For %s changed country from %s to %s", shibEntity.get("entityID"),
old_country, new_country));
}
}
Expand Down Expand Up @@ -287,7 +288,7 @@ private static String guessCountry(JSONObject entity) {
log.debug("Found code " + code + " for " + informationURL);
return code;
} else {
log.info("Country or location is null for " + informationURL);
log.debug("Country or location is null for " + informationURL);
}
} catch (IOException | GeoIp2Exception e) {
log.debug(e);
Expand All @@ -305,7 +306,7 @@ private static String guessCountry(JSONObject entity) {
return topLevel.toUpperCase();
}
} catch (MalformedURLException e) {
log.error(e.getMessage());
log.debug("ERROR: " + e.getMessage());
}
return "_all_"; // by default add "_all_", better search in dj
}
Expand Down