Adding an optional timeout to the s3 putObject function (#73)

* Update api.cfc * Adding timeout option to s3.cfc
jcberquist · Mar 29, 2023 · 187b85f · 187b85f
1 parent f15932c
commit 187b85f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/com/api.cfc b/com/api.cfc
@@ -58,7 +58,8 @@ component accessors="true" {
         any body = '',
         struct awsCredentials = { },
         boolean encodeurl = true,
-        boolean useSSL = true
+        boolean useSSL = true,
+        numeric timeout = 0
     ) {
         if ( awsCredentials.isEmpty() ) {
             awsCredentials = credentials.getCredentials();
@@ -86,6 +87,7 @@ component accessors="true" {
         httpArgs[ 'queryParams' ] = queryParams;
         httpArgs[ 'useSSL' ] = useSSL;
         if ( !isNull( arguments.body ) ) httpArgs[ 'body' ] = body;
+        if ( timeout ) httpArgs[ 'timeout' ] = timeout;
         // writeDump( httpArgs );
 
         var requestStart = getTickCount();

diff --git a/services/s3.cfc b/services/s3.cfc
@@ -615,7 +615,8 @@ component {
         string Expires = '',
         struct Metadata = { },
         string StorageClass = '',
-        string WebsiteRedirectLocation = ''
+        string WebsiteRedirectLocation = '',
+        numeric timeout = 0
     ) {
         var requestSettings = api.resolveRequestSettings( argumentCollection = arguments );
         var headers = { };
@@ -648,7 +649,8 @@ component {
             '/' & ObjectKey,
             { },
             headers,
-            FileContent
+            FileContent,
+            timeout
         );
         return apiResponse;
     }
@@ -903,7 +905,8 @@ component {
         string path = '/',
         struct queryParams = { },
         struct headers = { },
-        any payload = ''
+        any payload = '',
+        numeric timeout = 0
     ) {
         var host = getHost( requestSettings );
 
@@ -935,7 +938,8 @@ component {
             payload,
             requestSettings.awsCredentials,
             false,
-            useSSL
+            useSSL,
+            timeout
         );
     }