Changeset 1578:75312c1cab05

Show
Ignore:
Timestamp:
10/28/08 10:55:39 (2 months ago)
Author:
Greg Von Kuster <greg@bx.psu.edu>
branch:
default
Message:

Tweaks to my last commit - only persist job states defined in model, not job.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lib/galaxy/jobs/__init__.py

    r1577 r1578  
    118118            try: 
    119119                self.monitor_step() 
    120             except: 
    121                 log.exception( "Exception in monitor_step" ) 
     120            except Exception, e: 
     121                log.exception( "Exception in monitor_step: %s" % str( e ) ) 
    122122            # Sleep 
    123123            self.sleeper.sleep( 1 ) 
    …… 
    309309        return extra_filenames 
    310310         
    311     def fail( self, message, state=None, exception=False ): 
     311    def fail( self, message, exception=False ): 
    312312        """ 
    313313        Indicate job failure by setting state and message on all output  
    …… 
    317317        job.refresh() 
    318318        # if the job was deleted, don't fail it 
    319         if not job.state == job.states.DELETED: 
     319        if not job.state == model.Job.states.DELETED: 
    320320            for dataset_assoc in job.output_datasets: 
    321321                dataset = dataset_assoc.dataset 
    …… 
    326326                dataset.set_size() 
    327327                dataset.flush() 
    328             if state is not None: 
    329                 job.state = state 
    330             else: 
    331                 job.state = model.Job.states.ERROR 
     328            job.state = model.Job.states.ERROR 
    332329            job.command_line = self.command_line 
    333330            job.info = message 
    …… 
    386383            # don't run jobs for which the input dataset was deleted 
    387384            if idata.deleted: 
    388                 msg = "input data %d was deleted before this job started" % idata.hid 
    389                 self.fail( msg, state=JOB_INPUT_DELETED ) 
     385                self.fail( "input data %d was deleted before this job started" % idata.hid ) 
    390386                return JOB_INPUT_DELETED 
    391387            # an error in the input data causes us to bail immediately 
    392388            elif idata.state == idata.states.ERROR: 
    393                 msg = "input data %d is in an error state" % idata.hid 
    394                 self.fail( msg, state=JOB_INPUT_ERROR ) 
     389                self.fail( "input data %d is in an error state" % idata.hid ) 
    395390                return JOB_INPUT_ERROR 
    396391            elif idata.state != idata.states.OK: 
    …… 
    579574            try: 
    580575                self.monitor_step() 
    581             except: 
    582                 log.exception( "Exception in monitor_step" ) 
     576            except Exception, e: 
     577                log.exception( "Exception in monitor_step: %s" % str( e ) ) 
    583578            # Sleep 
    584579            self.sleeper.sleep( 1 )