Merge pull request #304 from samvera/fix/ip_logging

make ip logging more robust
samvera · Dec 17, 2019 · 993e0f0 · 993e0f0
2 parents 926d9e6 + 0114e1f
commit 993e0f0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/services/qa/linked_data/request_header_service.rb b/app/services/qa/linked_data/request_header_service.rb
@@ -70,9 +70,14 @@ def content_type_for_format
       private
 
         def log_request
-          gc = request.location
           msg = "******** #{request.path_parameters[:action].upcase}"
-          msg += " from IP #{request.ip} in {city: #{gc.city}, state: #{gc.state}, country: #{gc.country}}" unless Qa.config.suppress_ip_data_from_log
+          unless Qa.config.suppress_ip_data_from_log
+            gc = request.respond_to?(:location) ? request.location : nil
+            city = gc.nil? ? "UNKNOWN" : gc.city
+            state = gc.nil? ? "UNKNOWN" : gc.state
+            country = gc.nil? ? "UNKNOWN" : gc.country
+            msg += " from IP #{request.ip} in {city: #{city}, state: #{state}, country: #{country}}"
+          end
           Rails.logger.info(msg)
         end