Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update error handling for file operations #3041

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Update error handling for file operations #3041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions refinery/file_store/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down