diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2014-03-27 15:28:00 +1100 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2014-03-28 15:53:57 +1100 |
| commit | 5cd8ea3ce3a115f27424cfe3eb00cb0fbe4e3fca (patch) | |
| tree | 936a20579f5ace69f98e91ed0b5585aefb1a8b75 /turbo_hipster/worker_manager.py | |
| parent | 49c906314778ee588dc0036593bdbf92ac899b25 (diff) | |
| download | turbo-hipster-5cd8ea3ce3a115f27424cfe3eb00cb0fbe4e3fca.tar.gz | |
Add in tests for ZuulManager and ZuulClient
Also tidy up unnecessary fakes.
Change-Id: I165667faf61faa7fc06c10925db462e4650bda6a
Diffstat (limited to 'turbo_hipster/worker_manager.py')
| -rw-r--r-- | turbo_hipster/worker_manager.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/turbo_hipster/worker_manager.py b/turbo_hipster/worker_manager.py index 3923d35..a220425 100644 --- a/turbo_hipster/worker_manager.py +++ b/turbo_hipster/worker_manager.py @@ -57,6 +57,7 @@ class ZuulManager(threading.Thread): self._stop.set() # Unblock gearman self.log.debug("Telling gearman to stop waiting for jobs") + self.gearman_worker.stopWaitingForJobs() self.gearman_worker.shutdown() def stopped(self): @@ -76,8 +77,10 @@ class ZuulManager(threading.Thread): self.current_step = 0 job = self.gearman_worker.getJob() self._handle_job(job) + except gear.InterruptedError: + self.log.debug('We were asked to stop waiting for jobs') except: - logging.exception('Exception retrieving log event.') + self.log.exception('Unknown exception waiting for job.') self.log.debug("Finished manager thread") def _handle_job(self, job): @@ -137,6 +140,7 @@ class ZuulClient(threading.Thread): task.stop_working() # Unblock gearman self.log.debug("Telling gearman to stop waiting for jobs") + self.gearman_worker.stopWaitingForJobs() self.gearman_worker.shutdown() def stopped(self): @@ -155,8 +159,10 @@ class ZuulClient(threading.Thread): self.log.debug("Waiting for job") self.job = self.gearman_worker.getJob() self._handle_job() + except gear.InterruptedError: + self.log.debug('We were asked to stop waiting for jobs') except: - self.log.exception('Exception waiting for job.') + self.log.exception('Unknown exception waiting for job.') self.log.debug("Finished client thread") def _handle_job(self): |