Add timeouts

whatupdave · whatupdave · commit 8b1d7cf9b67c · 2017-05-27T16:16:29.000-07:00
diff --git a/app/models/sponsor.rb b/app/models/sponsor.rb
@@ -8,8 +8,21 @@ def ads_for(ip)
       params = { forwardedip: ip }
       params.merge!( testMode: true, ignore: true ) if Rails.env.development?
       uri      = URI::HTTPS.build(host: HOST, path: PATH, query: params.to_query)
-      response = Faraday.get(uri)
-      results  = JSON.parse(response.body) rescue nil
+
+      results = begin
+        start = Time.now
+        response = Faraday.new(url: uri).get do |req|
+          req.options.timeout = 2           # open/read timeout in seconds
+          req.options.open_timeout = 1      # connection open timeout in seconds
+        end
+        logger.info "sponsor=success seconds=#{"%.2f" % (Time.now - start)}"
+
+        JSON.parse(response.body) rescue nil
+      rescue Faraday::TimeoutError
+        logger.info "sponsor=timeout seconds=#{"%.2f" % (Time.now - start)}"
+        nil
+      end
+
       return [] if results.nil?
       results['ads'].select{|a| a['creativeid'] }.collect{ |data| build_sponsor(data) }
     end
diff --git a/config/database.yml b/config/database.yml
@@ -81,6 +81,10 @@ test:
 #
 production:
   <<: *default
+  connect_timeout: 1
+  checkout_timeout: 1
   database: coderwall-next_production
   username: coderwall-next
   password: <%= ENV['CODERWALL-NEXT_DATABASE_PASSWORD'] %>
+  variables:
+    statement_timeout: 500 # ms
diff --git a/config/puma.rb b/config/puma.rb
@@ -2,6 +2,9 @@
 threads_count = Integer(ENV['MAX_THREADS'] || 5)
 threads threads_count, threads_count
 
+worker_timeout 15
+worker_shutdown_timeout 8
+
 preload_app!
 
 rackup      DefaultRackup
