From 7f6a3bb346ed052ea1f47ee023d148e2fc945403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kuro=C4=8Denko?= Date: Fri, 13 Feb 2015 11:43:06 +0100 Subject: [PATCH 1/2] Update watcher documentation according virtualenv_py_ver option. --- circus/watcher.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circus/watcher.py b/circus/watcher.py index 1a76faf0a..12e6975f6 100755 --- a/circus/watcher.py +++ b/circus/watcher.py @@ -178,6 +178,10 @@ class Watcher(object): - **virtualenv** -- The root directory of a virtualenv. If provided, the watcher will load the environment for its execution. (default: None) + - **virtualenv_py_ver** -- Python version that is installed in virtualenv. + Use it to change default circus behaviour when it tries to load same version as + circus is using. + - **close_child_stdout**: If True, closes the stdout after the fork. default: False. From 15da023c6d78b9fa39a4666f1bc43fc4b745309e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kuro=C4=8Denko?= Date: Fri, 13 Feb 2015 11:45:56 +0100 Subject: [PATCH 2/2] Allow virtualenv and virtualenv_py_ver as valid options. --- circus/commands/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus/commands/util.py b/circus/commands/util.py index 3447b5955..be1932b89 100644 --- a/circus/commands/util.py +++ b/circus/commands/util.py @@ -92,7 +92,7 @@ def validate_option(key, val): 'shell', 'env', 'cmd', 'args', 'copy_env', 'retry_in', 'max_retry', 'graceful_timeout', 'stdout_stream', 'stderr_stream', 'max_age', 'max_age_variance', 'respawn', - 'singleton', 'hooks') + 'singleton', 'hooks', 'virtualenv', 'virtualenv_py_ver') valid_prefixes = ('stdout_stream.', 'stderr_stream.', 'hooks.', 'rlimit_')