add run_info_dir

Author: JinZhou5042

taskvine/src/bindings/python3/ndcctools/taskvine/manager.py

@@ -65,7 +65,8 @@ class Manager(object):
     # @param port       The port number to listen on. If zero, then a random port is chosen. A range of possible ports (low, hight) can be also specified instead of a single integer. Default is 9123
     # @param name       The project name to use.
     # @param shutdown   Automatically shutdown workers when manager is finished. Disabled by default.
-    # @param run_info_path Directory to write log (and staging if staging_path not given) files per run. If None, defaults to "vine-run-info"
+    # @param run_info_path Directory to archive workflow log directories, it is the upper level directory to run_info_dir. If None, defaults to "vine-run-info"
+    # @param run_info_dir  Directory to write log (and staging if staging_path not given) files per run. If None, defaults by a %Y-%m-%dT%H%M%S format.
     # @param staging_path Directory to write temporary files. Defaults to run_info_path if not given.
     # @param ssl        A tuple of filenames (ssl_key, ssl_cert) in pem format, or True.
     #                   If not given, then TSL is not activated. If True, a self-signed temporary key and cert are generated.
@@ -78,6 +79,7 @@ def __init__(self,
                  name=None,
                  shutdown=False,
                  run_info_path="vine-run-info",
+                 run_info_dir=None,
                  staging_path=None,
                  ssl=None,
                  init_fn=None,
@@ -113,6 +115,9 @@ def __init__(self,
         try:
             if run_info_path:
                 self.set_runtime_info_path(run_info_path)
+            if run_info_dir:
+                os.environ["VINE_RUNTIME_INFO_DIR"] = run_info_dir
+                # self.set_runtime_info_dir(run_info_dir)
 
             self._stats = cvine.vine_stats()
             self._stats_hierarchy = cvine.vine_stats()
@@ -559,8 +564,16 @@ def set_property(self, name, value):
     #
     # @param self     Reference to the current manager object.
     # @param dirname  A directory name
-    def set_runtime_info_path(self, dirname):
-        cvine.vine_set_runtime_info_path(dirname)
+    def set_runtime_info_path(self, path):
+        cvine.vine_set_runtime_info_path(path)
+
+    ##
+    # Specify the runtime info directory of this workflow, by default is a %Y-%m-%dT%H%M%S format.
+    #
+    # @param self     Reference to the current manager object.
+    # @param dirname  A directory name
+    def set_runtime_info_dir(self, dirname):
+        cvine.vine_set_runtime_info_dir(dirname)
 
     ##
     # Add a mandatory password that each worker must present.

taskvine/src/manager/taskvine.h

@@ -1489,6 +1489,11 @@ void vine_initialize_categories(struct vine_manager *m, struct rmsummary *max, c
 */
 void vine_set_runtime_info_path(const char *path);
 
+/** Sets the directory where a workflow-specific runtime logs are directly written into.
+@param dir A directory
+*/
+void vine_set_runtime_info_dir(const char *dir);
+
 /** Adds a custom APPLICATION entry to the debug log.
 @param m     Reference to the current manager object.
 @param entry A custom debug message.

taskvine/src/manager/vine_runtime_dir.c

@@ -163,3 +163,9 @@ void vine_set_runtime_info_path(const char *path)
 	assert(path);
 	vine_runtime_info_path = xxstrdup(path);
 }
+
+void vine_set_runtime_info_dir(const char *dir)
+{
+	assert(dir);
+	setenv("VINE_RUNTIME_INFO_DIR", dir, 1);
+}