Commit c63050ae authored by Helga Velroyen's avatar Helga Velroyen

Clean up configuration of curl request

This is a small patch cleaning up some thing in the
composition of the pycurl object for RPC calls.
For example, it removes some superfluous 'str' and
increases the logging level to warning when the
server cert is used.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 796258b4
......@@ -106,13 +106,13 @@ def Shutdown():
def _ConfigRpcCurl(curl):
noded_cert = str(pathutils.NODED_CERT_FILE)
noded_client_cert = str(pathutils.NODED_CLIENT_CERT_FILE)
noded_cert = pathutils.NODED_CERT_FILE
noded_client_cert = pathutils.NODED_CLIENT_CERT_FILE
# FIXME: The next two lines are necessary to ensure upgradability from
# 2.10 to 2.11. Remove in 2.12, because this slows down RPC calls.
if not os.path.exists(noded_client_cert):
logging.info("Using server certificate as client certificate for RPC"
logging.warn("Using server certificate as client certificate for RPC"
"call.")
noded_client_cert = noded_cert
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment