client/third_party/infra_libs/ts_mon/common/monitors.py - Issue 2673613003: luci-py: Roll infra_libs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/third_party/infra_libs/ts_mon/common/monitors.py

Issue 2673613003: luci-py: Roll infra_libs. (Closed)

Patch Set: rolll Created 3 years, 11 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:

Index: client/third_party/infra_libs/ts_mon/common/monitors.py

diff --git a/client/third_party/infra_libs/ts_mon/common/monitors.py b/client/third_party/infra_libs/ts_mon/common/monitors.py

index dfb99ffad7d88adef7532b8edf3b2e4b3b54e9d8..cb095fac2316d67b23f9c20e64c5a0ba4808d48f 100644

--- a/client/third_party/infra_libs/ts_mon/common/monitors.py

+++ b/client/third_party/infra_libs/ts_mon/common/monitors.py

@@ -91,12 +91,12 @@ class HttpsMonitor(Monitor):

'https://www.googleapis.com/auth/prodxmon'

]

- def __init__(self, endpoint, credentials_file_path, http=None):

+ def __init__(self, endpoint, credentials_file_path, http=None, ca_certs=None):

self._endpoint = endpoint

credentials = self._load_credentials(credentials_file_path)

if http is None:

http = httplib2_utils.RetriableHttp(

- httplib2_utils.InstrumentedHttp('acq-mon-api'))

+ httplib2_utils.InstrumentedHttp('acq-mon-api', ca_certs=ca_certs))

self._http = credentials.authorize(http)

def encodeToJson(self, metric_pb):