upfluence-utils 0.12.5 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352554519b5da13212f848debbb4f81bb61d3b495e6eac73aaa3c9ca9d9f91bd
-  data.tar.gz: f4c1159efc4a9dbbcd370a4c42e1b943ac95f022cb8e8f7b3ebd7570ca30a04b
+  metadata.gz: 8cc751a8c15d5d50d5a4e6233925f5842b6b5253f99f88794e9ce5764f3b0fd6
+  data.tar.gz: c8da722fb01f9d4ceebb537fd8b94e3abbde514d4c8d9a71a71659ebc9b4e2bb
 SHA512:
-  metadata.gz: 65de01e77b79862bb4ff1745e21d5cf96ba725a68cffd6239af06ad94c480588f4654b74be47e0db74f0179e03180dc7fbfa4e6ec251097a33ad3185d49d5b24
-  data.tar.gz: 8dd88b7f62b378c1cf656c90703f0b20b321b935d7ba758b21af5cc549a1e50ec793c3c5e8d7bc754a779108c48a544ee0ef50a7ca87a4a2d12fc9ea0def0a03
+  metadata.gz: 56eca8dbd6e79313f6901e0381d804556a138485b13dbcedf0724fa72d418417eb225929c42621b4279dffa281605aa37212913d84e49f71de4c3b6a5f3d5407
+  data.tar.gz: b3fc2813b90ba677a41078ccb7b3f940e0d2fe20470679eec30b5340423348a4481a7433d4677e26b5d41fa356e092c8170feb9601e9628121e0998dc22cdb0e

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)
       }
@@ -53,10 +58,16 @@ module Upfluence
           use Middleware::RequestStapler
           use Middleware::Logger
           use Middleware::Prometheus
-          use Prometheus::Middleware::Exporter if opts[:prometheus_endpoint]
           use Middleware::ApplicationHeaders, base_handler
           use Middleware::HandleException
+
+          if opts[:request_timeout]
+            use Rack::Timeout, service_timeout: opts[:request_timeout]
+          end
+
           use Upfluence.error_logger.middleware
+          use Prometheus::Middleware::Exporter if opts[:prometheus_endpoint]
+
           use Rack::ContentLength
           use Rack::Chunked
           use Rack::Lint if Upfluence.env.development?
@@ -64,7 +75,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.7'.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.7
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-02 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