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

Unified Diff: masters/buildbot.tac

Issue 2255333002: Revert of Re-land "Make Buildbot masters send ts_mon metrics, and add standard HTTP server metrics. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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 | « DEPS ('k') | scripts/master/master_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/buildbot.tac
diff --git a/masters/buildbot.tac b/masters/buildbot.tac
index 5a305ccec8de917e7146a6e09b16c920ab4d1cf2..b7d70d5c0a7503f83956a418daf2fd31f43d0381 100644
--- a/masters/buildbot.tac
+++ b/masters/buildbot.tac
@@ -8,33 +8,10 @@
twistd -y buildbot.tac -d path/to/master
"""
-import argparse
-import logging
import os
+from twisted.application import service
from buildbot.master import BuildMaster
-from infra_libs import ts_mon
-from twisted.application import service
-
-
-def setup_timeseries_monitoring():
- logging.basicConfig(level=logging.INFO)
-
- parser = argparse.ArgumentParser()
- ts_mon.add_argparse_options(parser)
- parser.set_defaults(
- ts_mon_target_type='task',
- ts_mon_task_service_name='buildmaster',
- ts_mon_task_job_name=os.path.basename(os.getcwd()),
- # Flushing is done by MonitoringStatusReceiver. Using 'auto' here doesn't
- # work because the thread doesn't get forked along with the rest of the
- # process by twistd.
- ts_mon_flush='manual',
- )
- args = parser.parse_args([])
- ts_mon.process_argparse_options(args)
-
application = service.Application('buildmaster')
BuildMaster(os.getcwd(), 'master.cfg').setServiceParent(application)
-setup_timeseries_monitoring()
« no previous file with comments | « DEPS ('k') | scripts/master/master_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698