Merge remote branch 'autotest-upstream/master' into try-box1

scheduler/monitor_db.py

 #!/usr/bin/python -u
 
 """
 Autotest scheduler
 """
 
 
 import common
 import datetime, errno, optparse, os, pwd, Queue, re, shutil, signal
 import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback, urllib
@@ skipping 141 matching lines @@
         _testing_mode = True
 
     server = status_server.StatusServer()
     server.start()
 
     try:
         initialize()
         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:
         email_manager.manager.log_stacktrace(
             "Uncaught exception; terminating monitor_db")
 
     email_manager.manager.send_queued_emails()
     server.shutdown()
     _drone_manager.shutdown()
     _db.disconnect()
@@ skipping 2436 matching lines @@
             paired_process = self._paired_with_monitor().get_process()
             _drone_manager.write_lines_to_file(
                     failed_file, ['Archiving failed with exit code %s'
                                   % self.monitor.exit_code()],
                     paired_with_process=paired_process)
         self._set_all_statuses(self._final_status())
 
 
 if __name__ == '__main__':
     main()