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

More warnings, less errors #1936

Merged
merged 2 commits into from
Mar 16, 2016
Merged

More warnings, less errors #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18a4edc
FTP directory not existing should be a warning, not an exception
mvdbeek Mar 16, 2016
5c45746
Metadata above max size should be a warning.
mvdbeek Mar 16, 2016
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
2 changes: 1 addition & 1 deletion lib/galaxy/model/custom_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def process_bind_param(self, value, dialect):
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

Expand Down
10 changes: 6 additions & 4 deletions lib/galaxy/webapps/galaxy/api/remote_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@ def index( self, trans, **kwd ):
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 ):
Expand All @@ -117,7 +118,8 @@ def __load_all_filenames( self, directory ):
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
Expand Down