From: Zack Cerza <zack@cerza.org>
Date: Wed, 22 Jul 2015 21:33:17 +0000 (-0600)
Subject: Merge pull request #546 from dachary/wip-stop-worker
X-Git-Tag: 1.1.0~865
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e2b9e76f7e3099b894ef8c8d9d6cd62cf58ee41e;p=teuthology.git

Merge pull request #546 from dachary/wip-stop-worker

add stop_worker: as a mean to shutdown the worker
---

e2b9e76f7e3099b894ef8c8d9d6cd62cf58ee41e
diff --cc teuthology/worker.py
index cc6eb7b1d7,200f34395a..843df9a3ef
--- a/teuthology/worker.py
+++ b/teuthology/worker.py
@@@ -79,11 -79,11 +79,12 @@@ def main(ctx)
      beanstalk.watch_tube(connection, ctx.tube)
      result_proc = None
  
 -    fetch_teuthology('master')
 +    if teuth_config.teuthology_path is None:
 +        fetch_teuthology('master')
      fetch_qa_suite('master')
  
-     while True:
+     keep_running = True
+     while keep_running:
          # Check to see if we have a teuthology-results process hanging around
          # and if so, read its return code so that it can exit.
          if result_proc is not None and result_proc.poll() is not None: