luci-py: Roll infra_libs.

client/third_party/infra_libs/ts_mon/config.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import logging
 import os
 import socket
 import sys
 import urlparse
@@ skipping 174 matching lines @@
   disabled by command line arguments.
 
   Args:
     args (argparse.Namespace): the result of parsing the command line arguments
   """
   # Parse the config file if it exists.
   config = load_machine_config(args.ts_mon_config_file)
   endpoint = config.get('endpoint', '')
   credentials = config.get('credentials', '')
   autogen_hostname = config.get('autogen_hostname', False)
+  use_new_proto = config.get('use_new_proto', False)
 
   # Command-line args override the values in the config file.
   if args.ts_mon_endpoint is not None:
     endpoint = args.ts_mon_endpoint
   if args.ts_mon_credentials is not None:
     credentials = args.ts_mon_credentials
+  if args.ts_mon_use_new_proto:
+    use_new_proto = args.ts_mon_use_new_proto
 
   if args.ts_mon_target_type == 'device':
     hostname = args.ts_mon_device_hostname
     if args.ts_mon_autogen_hostname or autogen_hostname:
       hostname = 'autogen:' + hostname
     interface.state.target = targets.DeviceTarget(
         args.ts_mon_device_region,
         args.ts_mon_device_role,
         args.ts_mon_device_network,
         hostname)
@@ skipping 29 matching lines @@
       project = url.netloc
       topic = url.path.strip('/')
       interface.state.global_monitor = monitors.PubSubMonitor(
           credentials, project, topic, use_instrumented_http=True,
           ca_certs=args.ts_mon_ca_certs)
     else:
       logging.error('ts_mon monitoring is disabled because credentials are not '
                     'available')
   elif endpoint.startswith('https://'):
     interface.state.global_monitor = monitors.HttpsMonitor(
-        endpoint, credentials)
+        endpoint, credentials, ca_certs=args.ts_mon_ca_certs)
   elif endpoint.lower() == 'none':
     logging.info('ts_mon monitoring has been explicitly disabled')
   else:
     logging.error('ts_mon monitoring is disabled because the endpoint provided'
                   ' is invalid or not supported: %s', endpoint)
 
   interface.state.flush_mode = args.ts_mon_flush
-  interface.state.use_new_proto = args.ts_mon_use_new_proto
+  interface.state.use_new_proto = use_new_proto
 
   if args.ts_mon_flush == 'auto':
     interface.state.flush_thread = interface._FlushThread(
         args.ts_mon_flush_interval_secs)
     interface.state.flush_thread.start()
 
   standard_metrics.init()