Changeset 8681 for main/waeup.stress/trunk/src/waeup/stress

Timestamp:

11 Jun 2012, 13:24:39 (12 years ago)

Author:

uli

Message:

Consider instance mode when starting/stopping instances.

File:

• main/waeup.stress/trunk/src/waeup/stress/__init__.py (modified) (2 diffs)

main/waeup.stress/trunk/src/waeup/stress/__init__.py

@@ -68 +68 @@
     return
 
-def start_instance(name):
+def start_instance(name, mode='paster'):
+    """Start instance `name` in `mode`.
+
+    The `name` should be someone like 'kofa', 'uniben', etc. where
+    ``waeup.<NAME>`` is an existent instance in the `instances/`
+    directory.
+
+    `mode` can be one of `paster`|`kofactl` and tells how to start the
+    instance.
+    """
     path = kofa_projects[name]
-    print "WAEUP.STRESS: starting instance %s at %s" % (name, path)
+    print "WAEUP.STRESS: starting instance %s at %s using %s" % (
+        name, path, mode),
     old_cwd_ = os.getcwd()
     os.chdir(path)
     # yes, shell _is_ neccessary here
-    subprocess.call(
-        './bin/paster serve --daemon parts/etc/debug.ini', shell=True)
+    if mode == 'kofactl':
+        subprocess.call('./bin/kofactl start', shell=True)
+    else:
+        # by default we start paster as daemon
+        subprocess.call(
+            './bin/paster serve --daemon parts/etc/debug.ini', shell=True)
     os.chdir(old_cwd_)
     return
@@ -92 +106 @@
     return
 
-def stop_instance(name):
+def stop_instance(name, mode='paster'):
+    """Stop instance `name` in `mode`.
+
+    The `name` should be someone like 'kofa', 'uniben', etc. where
+    ``waeup.<NAME>`` is an existent instance in the `instances/`
+    directory.
+
+    `mode` can be one of `paster`|`kofactl` and tells which tool to
+    use to stop the instance.
+    """
     path = kofa_projects[name]
-    print "WAEUP.STRESS: shutting down instance %s at %s" % (name, path),
+    print "WAEUP.STRESS: shutting down instance %s at %s using %s" % (
+        name, path, mode),
     old_cwd_ = os.getcwd()
     os.chdir(path)
-    subprocess.call(
+    if mode == 'kofactl':
+        subprocess.call('./bin/kofactl stop', shell=True)
+    else:
+        # by default we use paster
+        subprocess.call(
         './bin/paster serve --stop-daemon', shell=True)
     print "... done."