increase timeout for presigned obj

CDLUC3 · Jan 6, 2024 · d6ec4a0 · d6ec4a0
1 parent ce39dc7
commit d6ec4a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -187,8 +187,8 @@ def presign_obj_by_token
   def do_presign_obj_by_token(token, filename = 'object.zip', no_redirect = nil)
     r = create_http_cli(connect: 5, receive: 5, send: 5).get(
       File.join(APP_CONFIG['storage_presign_token'], token),
+      { timeout: 24 * 60 },
       { contentDisposition: "attachment; filename=#{filename}" },
-      {},
       follow_redirect: true
     )
     eval_presign_obj_by_token(r, no_redirect)

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
@@ -305,8 +305,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_return(
         mock_response(
@@ -330,8 +330,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_return(
         mock_response(
@@ -356,8 +356,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_return(
         mock_response(
@@ -380,8 +380,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_return(
         mock_response(
@@ -399,8 +399,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_return(
         mock_response(
@@ -417,8 +417,8 @@ def mock_httpclient
       filename = 'object.zip'
       expect(@client).to receive(:get).with(
         File.join(APP_CONFIG['storage_presign_token'], token),
+        { timeout: 24 * 60 },
         { contentDisposition: "attachment; filename=#{filename}" },
-        {},
         follow_redirect: true
       ).and_raise(
         HTTPClient::ReceiveTimeoutError