Update error handling for file operations (#3041)

refinery-platform · Oct 12, 2018 · 03db740 · 03db740
1 parent 22df7ec
commit 03db740
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/refinery/file_store/models.py b/refinery/file_store/models.py
@@ -143,7 +143,7 @@ def get_file_size(self):
             return self.datafile.size
         except ValueError:  # no datafile
             return 0
-        except (OSError, botocore.exceptions.ClientError,
+        except (EnvironmentError, botocore.exceptions.ClientError,
                 botocore.exceptions.ParamValidationError) as exc:
             # file is missing
             logger.critical("Error getting size for '%s': %s", self, exc)
@@ -181,7 +181,8 @@ def delete_datafile(self, save_instance=True):
             file_name = self.datafile.name
             try:
                 self.datafile.delete(save=save_instance)
-            except OSError as exc:
+            except (EnvironmentError, botocore.exceptions.ClientError,
+                    botocore.exceptions.ParamValidationError) as exc:
                 logger.error("Error deleting file '%s': %s", file_name, exc)
             else:
                 logger.info("Deleted datafile '%s'", file_name)