name job per first command in list

Author: cjayb

bin/submit_to_cluster

@@ -29,7 +29,7 @@ if args.project is None:
     try:
         proj_name = environ['MINDLABPROJ']
         if proj_name == 'NA':
-            raise KeyError('Force an error')
+            raise KeyError('MINDLABPROJ not defined')
     except KeyError:
         msg = ('You must specify a project name either by means of the '
                '--project flag or by setting the MINDLABPROJ environment '
@@ -40,8 +40,8 @@ else:
 # basic check of the memory-argument
 if args.total_memory is not None:
     if (not args.total_memory.startswith(
-        tuple('%d' % ii for ii in range(1, 10))) or
-            not args.total_memory.upper().endswith(('M', 'G', 'T'))):
+        tuple('%d' % ii for ii in range(1, 10))) or not
+            args.total_memory.upper().endswith(('M', 'G', 'T'))):
         raise ValueError('Bad memory format: {:s}'.format(args.total_memory))
 
 job = ClusterJob(args.exec_cmd, proj_name=proj_name, n_threads=args.n_threads,

stormdb/cluster.py

@@ -14,7 +14,7 @@
 import re
 import math
 from six import string_types
-from os.path import expanduser
+from os.path import expanduser, basename
 from .access import Query
 from .base import enforce_path_exists
 
@@ -260,7 +260,9 @@ def __init__(self,
             opt_threaded_flag = "#$ -pe threaded {:d}".format(self.n_threads)
 
         if job_name is None:
-            job_name = 'py-wrapper'
+            # self._cmd may have multiple \n-separated commands: take 1st
+            # basename followed by 0 or more spaces with arguments (ditch)
+            job_name = basename(self._cmd.split('\n')[0]).split(' ')[0]
         log_name_prefix = job_name
 
         if working_dir is not None and isinstance(working_dir, string_types):