[Swift-commit] r4715 - in SwiftApps/GOSwift: man pykoa/tools

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-29 16:30:14 -0500 (Wed, 29 Jun 2011)
New Revision: 4715

Modified:
   SwiftApps/GOSwift/man/goswift.1
   SwiftApps/GOSwift/pykoa/tools/koa_goswift.py
Log:
o changes to options.


Modified: SwiftApps/GOSwift/man/goswift.1
===================================================================
--- SwiftApps/GOSwift/man/goswift.1	2011-06-29 20:42:08 UTC (rev 4714)
+++ SwiftApps/GOSwift/man/goswift.1	2011-06-29 21:30:14 UTC (rev 4715)
@@ -22,6 +22,11 @@
 goswift
 command and output all the pertatent information.
 
+.TP
+.B -d
+Set  the deadline of the task.  If the task has not completed by the deadline it will beautomatically  canceled.   A  suffix  of 'm', 'h', or 'd' may be specified to indicate minutes, hours, or days.  If a unit suffix is not given it is assumed  to  be  minutes. Example: '30m', '4h', '1d'.  The default is '30m' (30 minutes).
+
+
 .SH EXAMPLES
 .TP
 .B goswift localhost ci#pads ci#beagle

Modified: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py
===================================================================
--- SwiftApps/GOSwift/pykoa/tools/koa_goswift.py	2011-06-29 20:42:08 UTC (rev 4714)
+++ SwiftApps/GOSwift/pykoa/tools/koa_goswift.py	2011-06-29 21:30:14 UTC (rev 4715)
@@ -33,9 +33,11 @@
 goswift [options] <sites> < \"goswift.package\"
 
 Executes Swift under Globus Online. The <sites> must be logical sites. This will not work for physical sites.
-Add site using enpoint-add and configure site using endpoint-modify.
+Add site using endpoint-add and configure site using endpoint-modify.
 
 Note: localhost runs on the VM.\
+
+Type 'man goswift' for details. \
 """
 
     # parse out options
@@ -44,6 +46,10 @@
                       default=False, action="store_true",
                       help="Output the Swift command line that will execute the workflow")
 
+    parser.add_option("-d", dest="deadline",
+                      default="30m",
+                      help="Set the time limit for this workflow.  " + \
+                           "Default: 30m (30 minutes)")
 
     (options, args) = pykoa.tools.parse_args(parser, argv)