Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scheduler/monitor_db.py

Issue 6551020: Merge remote branch 'autotest-upstream/master' into try-box1 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tests/tiobench/makefile.patch ('k') | scheduler/status_server.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scheduler/monitor_db.py
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index d0cf46e273b1f544a37a6cdc51ac24d0abffea6a..556eb1747b04173f167bfda8287b7f6af60541f1 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -159,7 +159,7 @@ def main_without_exception_handling():
dispatcher = Dispatcher()
dispatcher.initialize(recover_hosts=options.recover_hosts)
- while not _shutdown:
+ while not _shutdown and not server._shutdown_scheduler:
dispatcher.tick()
time.sleep(scheduler_config.config.tick_pause_sec)
except:
« no previous file with comments | « client/tests/tiobench/makefile.patch ('k') | scheduler/status_server.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698