kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-11 17:35:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes bug in https support changes by making rpc proxy default to 'http'

Browse Source
This commit is contained in:
Aaron Blankstein
2017-08-16 17:23:40 -04:00
parent 6b7107d3b0
commit bcbab3ef19
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
blockstack_client/proxy.py
View File

@@ -133,7 +133,9 @@ class BlockstackRPCClient(object):
timeout=DEFAULT_TIMEOUT, debug_timeline=False, protocol=None, **kw):
if protocol is None:
raise Exception("RPC constructor must be passed a protocol")
log.warn("RPC constructor called without a protocol, defaulting " +
"to HTTP, this could be an issue if connection is on :6263")
protocol = 'http'
self.url = '{}://{}:{}'.format(protocol, server, port)
self.srv = TimeoutServerProxy(self.url, protocol, timeout=timeout, allow_none=True)
self.server = server
@@ -1971,7 +1973,7 @@ def get_zonefile_inventory(hostport, bit_offset, bit_count, timeout=30, my_hostp
if proxy is None:
host, port = url_to_host_port(hostport)
assert host is not None and port is not None
proxy = BlockstackRPCClient(host, port, timeout=timeout, src=my_hostport)
proxy = BlockstackRPCClient(host, port, timeout=timeout, src=my_hostport, protocol = 'http')
zf_inv = None
try:
@@ -2027,11 +2029,10 @@ def get_atlas_peers(hostport, timeout=30, my_hostport=None, proxy=None):
schema = json_response_schema( peers_schema )
if proxy is None:
host, port = url_to_host_port(hostport)
assert host is not None and port is not None
proxy = BlockstackRPCClient(host, port, timeout=timeout, src=my_hostport)
proxy = BlockstackRPCClient(host, port, timeout=timeout, src=my_hostport, protocol = 'http')
peers = None
try: