Merge pull request #15069 from opf/chore/add-more-timeouts

Set operation and request httpx timeouts.
opf · Mar 21, 2024 · f9c3220 · f9c3220
2 parents 8fa06c4 + 5eb8d11
commit f9c3220
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/config/constants/settings/definition.rb b/config/constants/settings/definition.rb
@@ -742,6 +742,20 @@ class Definition
         allowed: (0..),
         default: 3
       },
+      httpx_operation_timeout: {
+        description: '',
+        format: :float,
+        writable: false,
+        allowed: (0..),
+        default: 10
+      },
+      httpx_request_timeout: {
+        description: '',
+        format: :float,
+        writable: false,
+        allowed: (0..),
+        default: 10
+      },
       httpx_read_timeout: {
         description: '',
         format: :float,

diff --git a/lib/open_project.rb b/lib/open_project.rb
@@ -58,6 +58,8 @@ def self.httpx
         .with(
           timeout: {
             connect_timeout: OpenProject::Configuration.httpx_connect_timeout,
+            operation_timeout: OpenProject::Configuration.httpx_operation_timeout,
+            request_timeout: OpenProject::Configuration.httpx_request_timeout,
             write_timeout: OpenProject::Configuration.httpx_write_timeout,
             read_timeout: OpenProject::Configuration.httpx_read_timeout,
             keep_alive_timeout: OpenProject::Configuration.httpx_keep_alive_timeout