3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/11a9a3eb748c/ Changeset: 11a9a3eb748c User: jmchilton Date: 2014-01-17 16:48:17 Summary: Provide item style access to runner params. Affected #: 1 file diff -r 2b0aba01ad8d5025684c19b33be4a3f1fb5916ae -r 11a9a3eb748c6b650c439b18881429041cc70b28 lib/galaxy/jobs/runners/__init__.py --- a/lib/galaxy/jobs/runners/__init__.py +++ b/lib/galaxy/jobs/runners/__init__.py @@ -41,6 +41,8 @@ def __getattr__( self, name ): return self.params.get( name, self.specs[ name ][ 'default' ] ) + __getitem__ = __getattr__ + class BaseJobRunner( object ): def __init__( self, app, nworkers, **kwargs ): https://bitbucket.org/galaxy/galaxy-central/commits/4c77668f7673/ Changeset: 4c77668f7673 User: jmchilton Date: 2014-01-17 16:48:17 Summary: Handle subclassed DRMAA exceptions properly. No clue if this was a problem, but realized it might be. Affected #: 1 file diff -r 11a9a3eb748c6b650c439b18881429041cc70b28 -r 4c77668f767364317d1ef9958cc93180a0e67e7c lib/galaxy/jobs/runners/drmaa.py --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -231,7 +231,10 @@ assert external_job_id not in ( None, 'None' ), '(%s/%s) Invalid job id' % ( galaxy_id_tag, external_job_id ) state = self.ds.jobStatus( external_job_id ) except ( drmaa.InternalException, drmaa.InvalidJobException ), e: - ecn = e.__class__.__name__ + if isinstance( e , drmaa.InvalidJobException ): + ecn = "InvalidJobException".lower() + else: + ecn = "InternalException".lower() retry_param = ecn.lower() + '_retries' state_param = ecn.lower() + '_state' retries = getattr( ajs, retry_param, 0 ) https://bitbucket.org/galaxy/galaxy-central/commits/315dc0e1cb48/ Changeset: 315dc0e1cb48 User: jmchilton Date: 2014-01-17 23:04:39 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #300) Potential DRMAA fixes. Affected #: 2 files diff -r a0de65af7094c5e9f33645b60eb14895ccacd6f1 -r 315dc0e1cb4889e477fd820b6455d4146ad1958d lib/galaxy/jobs/runners/__init__.py --- a/lib/galaxy/jobs/runners/__init__.py +++ b/lib/galaxy/jobs/runners/__init__.py @@ -41,6 +41,8 @@ def __getattr__( self, name ): return self.params.get( name, self.specs[ name ][ 'default' ] ) + __getitem__ = __getattr__ + class BaseJobRunner( object ): def __init__( self, app, nworkers, **kwargs ): diff -r a0de65af7094c5e9f33645b60eb14895ccacd6f1 -r 315dc0e1cb4889e477fd820b6455d4146ad1958d lib/galaxy/jobs/runners/drmaa.py --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -231,7 +231,10 @@ assert external_job_id not in ( None, 'None' ), '(%s/%s) Invalid job id' % ( galaxy_id_tag, external_job_id ) state = self.ds.jobStatus( external_job_id ) except ( drmaa.InternalException, drmaa.InvalidJobException ), e: - ecn = e.__class__.__name__ + if isinstance( e , drmaa.InvalidJobException ): + ecn = "InvalidJobException".lower() + else: + ecn = "InternalException".lower() retry_param = ecn.lower() + '_retries' state_param = ecn.lower() + '_state' retries = getattr( ajs, retry_param, 0 ) 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.