Merge remote branch 'cros/upstream' into tempbranch
BUG=
TEST=
Review URL: http://codereview.chromium.org/4823005
Change-Id: I5d56f1c10d0fce7f9d7dc3ad727ea52dcb9b2d6c
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 2d878bb..c5abed3 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -53,10 +53,16 @@
_db = None
_shutdown = False
_autoserv_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'server', 'autoserv')
-_parser_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'tko', 'parse')
_testing_mode = False
_drone_manager = None
+def _parser_path_default(install_dir):
+ return os.path.join(install_dir, 'tko', 'parse')
+_parser_path_func = utils.import_site_function(
+ __file__, 'autotest_lib.scheduler.site_monitor_db',
+ 'parser_path', _parser_path_default)
+_parser_path = _parser_path_func(drones.AUTOTEST_INSTALL_DIR)
+
def _get_pidfile_timeout_secs():
"""@returns How long to wait for autoserv to write pidfile."""