Skip to content

Commit addac90

Browse files
committed
jsonrpcproxy: Fix info page
1 parent f250911 commit addac90

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

scripts/jsonrpcproxy.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
DELIMITER = ord('\n')
3333
INFO = """JSON-RPC Proxy
3434
35-
Version: {}
36-
Proxy: {}
37-
Backend: {}
35+
Version: {version}
36+
Proxy: {proxy_url}
37+
Backend: {backend_url} (connected: {connected})
3838
"""
3939

4040

@@ -57,6 +57,9 @@ def _get_error_message(os_error_number):
5757
return "Connection to '{}' refused"
5858
return "Unknown error when connecting to '{}'"
5959

60+
def is_connected(self):
61+
return self.socket is not None
62+
6063
def _connect(self):
6164
if self.socket is None:
6265
try:
@@ -104,6 +107,9 @@ def __init__(self, ipc_path):
104107
except pywintypes.error as err:
105108
raise IOError(err)
106109

110+
def is_connected(self):
111+
return True
112+
107113
def recv(self, max_length):
108114
(err, data) = win32file.ReadFile(self.handle, max_length)
109115
if err:
@@ -138,7 +144,9 @@ def do_GET(self):
138144
backend_url = 'unix:' + self.server.backend_address
139145
proxy_url = '{}:{}'.format(self.server.server_name,
140146
self.server.server_port)
141-
info = INFO.format(VERSION, backend_url, proxy_url)
147+
info = INFO.format(version=VERSION, proxy_url=proxy_url,
148+
backend_url=backend_url,
149+
connected=self.server.conn.is_connected())
142150
self.wfile.write(info.encode('utf-8'))
143151

144152
def do_OPTIONS(self):

0 commit comments

Comments
 (0)