Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 7.3.2
- Add logs when MaxMind databases fail to deserialize custom field [#235](https://github.com/logstash-plugins/logstash-filter-geoip/pull/235)

## 7.3.1
- Avoid to crash pipelines when lookup a database with customised fields. [#225](https://github.com/logstash-plugins/logstash-filter-geoip/pull/225)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.1
7.3.2
4 changes: 2 additions & 2 deletions src/main/java/org/logstash/filters/geoip/GeoIPFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class GeoIPFilter implements Closeable {
// for more details https://github.com/logstash-plugins/logstash-filter-geoip/issues/226
static class GeoIp2InvalidCustomFieldException extends GeoIp2Exception {
public GeoIp2InvalidCustomFieldException(Throwable cause) {
super("invalid custom field", cause);
super("The database contains invalid custom field, which caused deserialization to fail.", cause);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: There is double tab.

}
}

Expand Down Expand Up @@ -199,7 +199,7 @@ public boolean handleEvent(RubyEvent rubyEvent) {
} catch (AddressNotFoundException e) {
logger.debug("IP not found! exception={}, field={}, event={}", e, sourceField, event);
} catch (GeoIp2Exception | IOException e) {
logger.debug("GeoIP2 Exception. exception={}, field={}, event={}", e, sourceField, event);
logger.error("Error from GeoIP database. field={}, value={}", sourceField, ip, e);
}

return applyGeoData(geoData, event);
Expand Down