GeoIP clean up database after new download #12689
Merged
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
|
PR is waiting for logstash-plugins/logstash-filter-geoip#176 to publish and allow Logstash to unblock test cases |
18 tasks
kaisecheng
force-pushed
the
geoip_cleanup_db
branch
from
ca909d8
to
43ea2ce
Compare
andsel
approved these changes
Mar 2, 2021
|
|
||
| database_path | ||
| return database_path if file_exist?(database_path) | ||
| return database_path if database_path = get_file_path("GeoLite2-#{@database_type}.mmdb") and file_exist?(database_path) |
There was a problem hiding this comment.
As I understand this if statement checks for default database path, so be more specific could help readability:
Suggested change
| return database_path if database_path = get_file_path("GeoLite2-#{@database_type}.mmdb") and file_exist?(database_path) | |
| default_database_path = get_file_path("GeoLite2-#{@database_type}.mmdb") | |
| return default_database_path if default_database_path and file_exist?(default_database_path) |
Maybe the not nil check of default_database_path could be embedded into file_exists?
kaisecheng
added a commit
to kaisecheng/logstash
that referenced
this pull request
Mar 2, 2021
This commit adds a clean-up step to remove .gz and .mmdb which is not in the metadata after pointing to the new GeoIP database Fixed: elastic#12560
kaisecheng
added a commit
to kaisecheng/logstash
that referenced
this pull request
Mar 25, 2021
This commit adds a clean-up step to remove .gz and .mmdb which is not in the metadata after pointing to the new GeoIP database Fixed: elastic#12560
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.
This PR adds a clean-up step after a new GeoIP database download.
After pointing to new database, database_manager removes .gz and .mmdb which is not in the metadata.
Related issues
Logstash PR #12675
Meta #12560