From 18a4edc1ca1bd491f644e6ee8ca011950cb15797 Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Wed, 16 Mar 2016 11:44:49 +0100 Subject: [PATCH 1/2] FTP directory not existing should be a warning, not an exception --- lib/galaxy/webapps/galaxy/api/remote_files.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/remote_files.py b/lib/galaxy/webapps/galaxy/api/remote_files.py index e60e82c5b16..2e1dc52010c 100644 --- a/lib/galaxy/webapps/galaxy/api/remote_files.py +++ b/lib/galaxy/webapps/galaxy/api/remote_files.py @@ -96,10 +96,11 @@ class RemoteFilesAPIController( BaseAPIController ): if user_ftp_dir is not None: response = self.__load_all_filenames( user_ftp_dir ) else: - raise exceptions.ConfigDoesNotAllowException( 'You do not have an FTP directory named as your login at this Galaxy instance.' ) + log.warning( 'You do not have an FTP directory named as your login at this Galaxy instance.' ) + return None except Exception, exception: - log.error( 'Could not get ftp files: %s', str( exception ), exc_info=True ) - raise exceptions.InternalServerError( 'Could not get the files from your FTP folder.' ) + log.warning( 'Could not get ftp files: %s', str( exception ), exc_info=True ) + return None return response def __load_all_filenames( self, directory ): @@ -117,7 +118,8 @@ class RemoteFilesAPIController( BaseAPIController ): size=statinfo.st_size, ctime=time.strftime( "%m/%d/%Y %I:%M:%S %p", time.localtime( statinfo.st_ctime ) ) ) ) else: - raise exceptions.ConfigDoesNotAllowException( 'The given directory does not exist.' ) + log.warning( "The directory \"%s\" does not exist." % directory ) + return response # sort by path response = sorted(response, key=itemgetter("path")) return response From 5c45746e4203d22edfa03c10de6cbf830ff3bf5f Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Wed, 16 Mar 2016 11:51:28 +0100 Subject: [PATCH 2/2] Metadata above max size should be a warning. --- lib/galaxy/model/custom_types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/model/custom_types.py b/lib/galaxy/model/custom_types.py index 7dc4fe2e9e2..6930b2e0492 100644 --- a/lib/galaxy/model/custom_types.py +++ b/lib/galaxy/model/custom_types.py @@ -271,7 +271,7 @@ class MetadataType( JSONType ): sz = total_size(v) if sz > app.app.config.max_metadata_value_size: del value[k] - log.error('Refusing to bind metadata key %s due to size (%s)' % (k, sz)) + log.warning('Refusing to bind metadata key %s due to size (%s)' % (k, sz)) value = json_encoder.encode(value) return value