You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/07/02 17:09:32 UTC
[17/23] allura git commit: [#7803] tweak regex to match taskd procs
currently handling a task
[#7803] tweak regex to match taskd procs currently handling a task
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/661c8d0f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/661c8d0f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/661c8d0f
Branch: refs/heads/hs/7894
Commit: 661c8d0f2296269e6a9929d3640f161622fd1d78
Parents: 446a39d
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon Jun 29 20:26:39 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Jun 29 20:27:02 2015 +0000
----------------------------------------------------------------------
Allura/allura/command/taskd_cleanup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/661c8d0f/Allura/allura/command/taskd_cleanup.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/taskd_cleanup.py b/Allura/allura/command/taskd_cleanup.py
index 99caa80..47d09bf 100644
--- a/Allura/allura/command/taskd_cleanup.py
+++ b/Allura/allura/command/taskd_cleanup.py
@@ -128,8 +128,8 @@ class TaskdCleanupCommand(base.Command):
})
def _taskd_pids(self):
- # space after "taskd" to ensure no match on taskd_cleanup (ourself)
- p = subprocess.Popen(['pgrep', '-f', '^taskd '],
+ # space or colon after "taskd" to ensure no match on taskd_cleanup (ourself)
+ p = subprocess.Popen(['pgrep', '-f', '^taskd[ :]'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = p.communicate()