upfluence-utils 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352554519b5da13212f848debbb4f81bb61d3b495e6eac73aaa3c9ca9d9f91bd
-  data.tar.gz: f4c1159efc4a9dbbcd370a4c42e1b943ac95f022cb8e8f7b3ebd7570ca30a04b
+  metadata.gz: ea9c2d716e73e1b7e75c956697b57490c5f186dc7dc6fbce331b8c9dec57ca59
+  data.tar.gz: 4d77fded409b2ed689b8bd3dc8f4ff4c464474ac130d7e1437b67ccd37e48429
 SHA512:
-  metadata.gz: 65de01e77b79862bb4ff1745e21d5cf96ba725a68cffd6239af06ad94c480588f4654b74be47e0db74f0179e03180dc7fbfa4e6ec251097a33ad3185d49d5b24
-  data.tar.gz: 8dd88b7f62b378c1cf656c90703f0b20b321b935d7ba758b21af5cc549a1e50ec793c3c5e8d7bc754a779108c48a544ee0ef50a7ca87a4a2d12fc9ea0def0a03
+  metadata.gz: b61684b170e6fa36e93189d58866cd359d3a83bf12fa58d89b4c881451f947a637c4bf6b6f84adb592f4018d544e0486474277c9dc21270aceabee27c9bd7656
+  data.tar.gz: 6451711114ae81c5e04be67c97df30978cb87ef3873df55f648c7cc2ee7675bf33fa00da6e4d555354c638a1be6a1f2df0e22abe0ddaad551ee9778211b7881f

data/lib/upfluence/http/server.rb

@@ -1,11 +1,13 @@
 require 'rack/handler'
 require 'rack/etag'
+require 'rack/timeout/base'
 require 'prometheus/client'
 require 'prometheus/client/push'
 require "prometheus/middleware/exporter"
 
 require 'upfluence/environment'
 require 'upfluence/error_logger'
+require 'upfluence/logger'
 
 require 'upfluence/http/builder'
 require 'upfluence/http/endpoint/healthcheck'
@@ -17,6 +19,8 @@ require 'upfluence/http/middleware/prometheus'
 require 'upfluence/http/middleware/cors'
 require 'upfluence/http/middleware/request_stapler'
 
+Rack::Timeout::Logger.disable
+
 module Upfluence
   module HTTP
     class Server
@@ -36,6 +40,7 @@ module Upfluence
         base_processor_klass:  nil,
         base_handler_klass:    nil,
         max_threads:           ENV.fetch('HTTP_SERVER_MAX_THREADS', 5).to_i,
+        request_timeout:       ENV['HTTP_SERVER_REQUEST_TIMEOUT']&.to_i,
         middlewares:           [],
         debug:                 ENV.fetch('DEBUG', nil)
       }
@@ -50,6 +55,10 @@ module Upfluence
         end
 
         @builder = Builder.new do
+          if opts[:request_timeout]
+            use Rack::Timeout, service_timeout: opts[:request_timeout]
+          end
+
           use Middleware::RequestStapler
           use Middleware::Logger
           use Middleware::Prometheus
@@ -64,7 +73,7 @@ module Upfluence
           use Rack::ETag
           use Middleware::CORS if Upfluence.env.development?
 
-          (DEFAULT_MIDDLEWARES || opts[:middlewares]).each do |m|
+          (DEFAULT_MIDDLEWARES + opts[:middlewares]).each do |m|
             m = [m] unless m.is_a?(Array)
             use(*m)
           end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.12.5'.freeze
+    VERSION = '0.12.6'.freeze
   end
 end

data/rbutils.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'userializer'
   spec.add_runtime_dependency 'activerecord'
   spec.add_runtime_dependency 'loofah'
+  spec.add_runtime_dependency 'rack-timeout'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - dev@upfluence.com
@@ -309,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects