change errorhandling at s3 download

hpi-schul-cloud · Apr 27, 2023 · 4275f50 · 4275f50
1 parent 9dab3bd
commit 4275f50
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/schulcloud/h5p/upload.py b/schulcloud/h5p/upload.py
@@ -442,23 +442,24 @@ def download_object(self, object_key: str, dir_path: str, callback: Optional[Cal
     def retry_function(function, params: Dict, max_retries: int):
         retries = 0
         while retries < max_retries:
-            print(f'>>>>try1 {function}')
             try:
-                print(f'>>>>try2 {function}')
                 function(**params)
                 break
             except (ResponseStreamingError, ConnectionResetError, ProtocolError) as error:
-                print(f'Got Error1: {type(error)}')
+                print(f'>>>>>>Got Error1: {type(error)}')
                 if retries == max_retries - 1:
-                    print(f'>>>>>error')
                     raise error
                 else:
-                    print(f'retry: {retries} for {function}')
+                    print(f'>>>>>>retry: {retries} for {function}')
                     retries = retries + 1
             except BaseException as error:
-                print(f'Got Error2: {type(error)}')
-                print(f'Errortype is ResponseStreamingError: {type(error) is ResponseStreamingError}')
-                raise error
+                print(f'>>>>>>Got Error2: {type(error)}')
+                print(f'>>>>>>Errortype is ResponseStreamingError: {type(error) is ResponseStreamingError}')
+                if retries == max_retries - 1:
+                    raise error
+                else:
+                    print(f'retry: {retries} for {function}')
+                    retries = retries + 1
 
 
 class MetadataNotFoundError(Exception):