diff --git a/gridmap/conf.py b/gridmap/conf.py index f80bbe6..f1fe4f4 100644 --- a/gridmap/conf.py +++ b/gridmap/conf.py @@ -53,7 +53,7 @@ running. (Default: 1.0) :var MAX_IDLE_HEARTBEATS: Number of heartbeats we can receive where the process - has >= IDLE_THRESHOLD CPU utilization and is sleeping + has <= IDLE_THRESHOLD CPU utilization and is sleeping before we consider the process dead. (Default: 3) :var NUM_RESUBMITS: How many times can a particular job can die, before we give up. (Default: 3) diff --git a/gridmap/job.py b/gridmap/job.py index 9581d03..a8ea2f8 100644 --- a/gridmap/job.py +++ b/gridmap/job.py @@ -789,7 +789,7 @@ def process_jobs(jobs, temp_dir='/scratch/', white_list=None, quiet=True, if (not local and not DRMAA_PRESENT): logger = logging.getLogger(__name__) logger.warning('Could not import drmaa. Processing jobs locally.') - local = False + local = True if not local: # initialize monitor to get port number diff --git a/gridmap/version.py b/gridmap/version.py index de9b760..7cc5dd8 100644 --- a/gridmap/version.py +++ b/gridmap/version.py @@ -28,5 +28,5 @@ :organization: ETS ''' -__version__ = '0.12.2' +__version__ = '0.12.3' VERSION = tuple(int(x) for x in __version__.split('.')) diff --git a/gridmap/web.py b/gridmap/web.py index be7d850..e6f70a8 100755 --- a/gridmap/web.py +++ b/gridmap/web.py @@ -80,9 +80,8 @@ def list_jobs(self, address): ''' for job in jobs: - out_html += ("