2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a601d530ec95/ changeset: a601d530ec95 user: carlfeberhard date: 2013-03-07 01:35:29 summary: api: add exception type to history_contents, index errors affected #: 1 file diff -r 7677b8c3ef43d06eda783f1c08ec521d2bd625e5 -r a601d530ec9577eace628940dd4a385aebb803f3 lib/galaxy/webapps/galaxy/api/history_contents.py --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -73,8 +73,8 @@ # don't fail entire list if hda err's, record and move on # (making sure http recvr knows it's err'd) trans.response.status = 500 - log.error( "Error in history API at listing contents " + - "with history %s, hda %s: %s", history_id, encoded_hda_id, str( exc ) ) + log.error( "Error in history API at listing contents with history %s, hda %s: (%s) %s", + history_id, encoded_hda_id, type( exc ), str( exc ) ) rval.append( self._exception_as_hda_dict( trans, encoded_hda_id, exc ) ) else: https://bitbucket.org/galaxy/galaxy-central/commits/68455758f27e/ changeset: 68455758f27e user: carlfeberhard date: 2013-03-07 01:36:25 summary: objectstore: add messages to ObjectNot* exceptions raised affected #: 1 file diff -r a601d530ec9577eace628940dd4a385aebb803f3 -r 68455758f27e572cd637fc2b014773f0dfa9002d lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -731,7 +731,8 @@ if self.exists(obj, **kwargs): return bool(self.size(obj, **kwargs) > 0) else: - raise ObjectNotFound() + raise ObjectNotFound( 'objectstore.empty, object does not exist: %s, kwargs: %s' + %( str( obj ), str( kwargs ) ) ) def size(self, obj, **kwargs): rel_path = self._construct_path(obj, **kwargs) @@ -816,7 +817,8 @@ # even if it does not exist. # if dir_only: # return cache_path - raise ObjectNotFound() + raise ObjectNotFound( 'objectstore.get_filename, no cache_path: %s, kwargs: %s' + %( str( obj ), str( kwargs ) ) ) # return cache_path # Until the upload tool does not explicitly create the dataset, return expected path def update_from_file(self, obj, file_name=None, create=False, **kwargs): @@ -841,7 +843,8 @@ # Update the file on S3 self._push_to_os(rel_path, source_file) else: - raise ObjectNotFound() + raise ObjectNotFound( 'objectstore.update_from_file, object does not exist: %s, kwargs: %s' + %( str( obj ), str( kwargs ) ) ) def get_object_url(self, obj, **kwargs): if self.exists(obj, **kwargs): @@ -947,7 +950,8 @@ try: obj.object_store_id = random.choice(self.weighted_backend_ids) except IndexError: - raise ObjectInvalid() + raise ObjectInvalid( 'objectstore.create, could not generate obj.object_store_id: %s, kwargs: %s' + %( str( obj ), str( kwargs ) ) ) object_session( obj ).add( obj ) object_session( obj ).flush() log.debug("Selected backend '%s' for creation of %s %s" % (obj.object_store_id, obj.__class__.__name__, obj.id)) @@ -984,7 +988,8 @@ if object_store_id is not None: return self.backends[object_store_id].__getattribute__(method)(obj, **kwargs) if default_is_exception: - raise default() + raise default( 'objectstore, __call_method failed: %s on %s, kwargs: %s' + %( method, str( obj ), str( kwargs ) ) ) else: return default @@ -1073,4 +1078,3 @@ calling_format=calling_format, path=config.os_conn_path) return s3_conn - Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.