please reject this request #67
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added new package while working on new code, still learning my way around.
Moved code from com.nexage.graylog2 package to org.graylog.jsonshortmessage package Added support for list of key strings of key-value pairs to drop while parsing a short message. Included update to configuration package, initialization in the Main function. Modified the parser hook to look at Drools rules and then JSON-based parsing.
Extending parsing hook to support parsing of JSON formatted shortMessage part of GELF message.
…ers/webber/src/github/graylog2-server into develop
make m2e ignore the scala lifecycle plugins
can now be forced! fixes #SERVER-23
fixes #SERVER-89
Conflicts: src/main/java/org/graylog2/Main.java
Catch IO and map/array manipulation exceptions and handling them. Add selective logging with warnings and fatal errors.
|
Great idea - Waiting for the final pull request. :) |
joschi
added a commit
that referenced
this pull request
Feb 13, 2018
* Migrate from TestNg to JUnit * Add GeoLite2 Country database for tests Version: 20180102 Download URL: https://dev.maxmind.com/geoip/geoip2/geolite2/#Downloads * Improve null-handling in MaxmindDataAdapter Fix #67 * Use null-safe map (HashMap) in MaxmindDataAdapter#doGet() * Properly handle absence of CityResponse.location
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'd like to clean up my work and resubmit it. Please close this request.