Skip to content

Preload geocoder database, to minimize timeouts #5603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zachmargolis merged 2 commits into from
Nov 12, 2021
Merged

Preload geocoder database, to minimize timeouts #5603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e57b5
Flip order of Geocoder conditional, positive test case first
zachmargolis Nov 10, 2021
6d2a310
Force Geocoder to load the database by doing a lookup (LG-5318)
zachmargolis Nov 10, 2021
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
17 changes: 9 additions & 8 deletions config/initializers/geocoder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@ def language=(_locale); end

GEO_DATA_FILEPATH = Rails.root.join(IdentityConfig.store.geo_data_file_path).freeze

if !Rails.env.production? && !File.exist?(GEO_DATA_FILEPATH)
Geocoder.configure(ip_lookup: :test)
Geocoder::Lookup::Test.set_default_stub(
[
{ 'city' => '', 'country' => 'United States', 'state_code' => '' },
],
)
else
if Rails.env.production? && File.exist?(GEO_DATA_FILEPATH)
Geocoder.configure(
ip_lookup: :geoip2,
geoip2: {
file: GEO_DATA_FILEPATH,
},
)
Geocoder.search('1.2.3.4') # the datasource is lazily loaded, make sure it eager loads
Copy link
Contributor Author

@zachmargolis zachmargolis Nov 10, 2021

Choose a reason for hiding this comment

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

this line is the meaningful change in here (6d2a310)

else
Geocoder.configure(ip_lookup: :test)
Geocoder::Lookup::Test.set_default_stub(
[
{ 'city' => '', 'country' => 'United States', 'state_code' => '' },
],
)
end