PERF: avoid DNS lookups when getting IP info

Also cleans up interface in DiscourseIpInfo
grew cache to 2000 entries

app/controllers/admin/users_controller.rb

@@ -436,7 +436,7 @@ class Admin::UsersController < Admin::AdminController
   def ip_info
     params.require(:ip)
 
-    render json: DiscourseIpInfo.get(params[:ip])
+    render json: DiscourseIpInfo.get(params[:ip], resolve_hostname: true)
   end
 
   def sync_sso

app/serializers/concerns/user_auth_tokens_mixin.rb

@@ -20,7 +20,7 @@ module UserAuthTokensMixin
   end
 
   def location
-    ipinfo = DiscourseIpInfo.get(client_ip, I18n.locale)
+    ipinfo = DiscourseIpInfo.get(client_ip, locale: I18n.locale)
 
     location = [ipinfo[:city], ipinfo[:region], ipinfo[:country]].reject { |x| x.blank? }.join(", ")
     return I18n.t('staff_action_logs.unknown') if location.blank?

lib/discourse_ip_info.rb

@@ -11,7 +11,7 @@ class DiscourseIpInfo
   def open_db(path)
     @loc_mmdb = mmdb_load(File.join(path, 'GeoLite2-City.mmdb'))
     @asn_mmdb = mmdb_load(File.join(path, 'GeoLite2-ASN.mmdb'))
-    @cache = LruRedux::ThreadSafeCache.new(1000)
+    @cache = LruRedux::ThreadSafeCache.new(2000)
   end
 
   def mmdb_load(filepath)
@@ -24,7 +24,7 @@ class DiscourseIpInfo
     end
   end
 
-  def lookup(ip, locale = :en)
+  def lookup(ip, locale: :en, resolve_hostname: false)
     ret = {}
 
     if @loc_mmdb
@@ -57,27 +57,32 @@ class DiscourseIpInfo
       end
     end
 
-    begin
+    # this can block for quite a while
-      result = Resolv::DNS.new.getname(ip)
+    # only use it explicitly when needed
-      ret[:hostname] = result&.to_s
+    if resolve_hostname
-    rescue Resolv::ResolvError
+      begin
+        result = Resolv::DNS.new.getname(ip)
+        ret[:hostname] = result&.to_s
+      rescue Resolv::ResolvError
+      end
     end
 
     ret
   end
 
-  def get(ip, locale = :en)
+  def get(ip, locale: :en, resolve_hostname: false)
     ip = ip.to_s
     locale = locale.to_s.sub('_', '-')
 
-    @cache["#{ip}-#{locale}"] ||= lookup(ip, locale)
+    @cache["#{ip}-#{locale}-#{resolve_hostname}"] ||=
+      lookup(ip, locale: locale, resolve_hostname: resolve_hostname)
   end
 
   def self.open_db(path)
     instance.open_db(path)
   end
 
-  def self.get(ip, locale = :en)
+  def self.get(ip, locale: :en, resolve_hostname: false)
-    instance.get(ip, locale)
+    instance.get(ip, locale: locale, resolve_hostname: resolve_hostname)
   end
 end