autotest: don't start status_server within scheduler
A follow up CL will delete the status_server code an all its remaining
callers.
BUG=chromium:718685
TEST=None
Change-Id: Iebc20e16dd98ebdd1204b21d5efdf5e3dc9109c4
Reviewed-on: https://chromium-review.googlesource.com/497306
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 7a8fad1..114e959 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -32,7 +32,7 @@
from autotest_lib.scheduler import query_managers
from autotest_lib.scheduler import scheduler_lib
from autotest_lib.scheduler import scheduler_models
-from autotest_lib.scheduler import status_server, scheduler_config
+from autotest_lib.scheduler import scheduler_config
from autotest_lib.server import autoserv_utils
from autotest_lib.server import system_utils
from autotest_lib.server import utils as server_utils
@@ -165,9 +165,6 @@
global _testing_mode
_testing_mode = True
- server = status_server.StatusServer()
- server.start()
-
# Start the thread to report metadata.
metadata_reporter.start()
@@ -180,7 +177,7 @@
minimum_tick_sec = global_config.global_config.get_config_value(
scheduler_config.CONFIG_SECTION, 'minimum_tick_sec', type=float)
- while not _shutdown and not server._shutdown_scheduler:
+ while not _shutdown:
start = time.time()
dispatcher.tick()
curr_tick_sec = time.time() - start
@@ -198,7 +195,6 @@
metadata_reporter.abort()
email_manager.manager.send_queued_emails()
- server.shutdown()
_drone_manager.shutdown()
_db_manager.disconnect()
