Mercurial > lbo > hg > stex
changeset 43:6af868bc6f61
Fix address parsing in client
| author | Lewin Bormann <lbo@spheniscida.de> |
|---|---|
| date | Sun, 23 Feb 2020 12:44:41 +0100 |
| parents | 3d9a2dc8f22b |
| children | 4b45d013cec9 |
| files | client/client.py server/server.py |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/client/client.py Tue Nov 05 18:45:09 2019 +0100 +++ b/client/client.py Sun Feb 23 12:44:41 2020 +0100 @@ -445,9 +445,7 @@ socket.setsockopt(zmq.RCVTIMEO, 0) socket.setsockopt(zmq.SNDTIMEO, 10) - u = url.urlparse(creds.addr) - hostport = u.netloc or u.path - (host, _, port) = hostport.partition(':') + (host, _, port) = creds.addr.partition(':') socket.connect('tcp://{}:{}'.format(host, int(port if port else '9988') + 1)) self.socket = socket
--- a/server/server.py Tue Nov 05 18:45:09 2019 +0100 +++ b/server/server.py Sun Feb 23 12:44:41 2020 +0100 @@ -160,7 +160,7 @@ interactivesocket = zctx.socket(zmq.ROUTER) interactivesocket.setsockopt(zmq.IPV6, 1) - interactivesocket.bind('tcp://{}:{}'.format(self.address or '[::]', int(port) + 1 if self.port else '9989')) + interactivesocket.bind('tcp://{}:{}'.format(self.address or '[::]', int(port) + 1 if self.port else 9989)) interactivesocket.setsockopt(zmq.RCVTIMEO, 0) self.interactivesocket = interactivesocket @@ -205,7 +205,6 @@ while True: before = time.clock_gettime_ns(time.CLOCK_MONOTONIC) events = p.poll(nextinterval) - if len(events) > 0: self.handle_calls(events) diff = (time.clock_gettime_ns(time.CLOCK_MONOTONIC) - before) / 1e6 @@ -243,6 +242,7 @@ groupinfo = {'cash': message.get('cash', -1), 'value': message.get('value', -1)} _groups.update(group, user, groupinfo) return {'_stockresp': True, 'ok': True, 'groupinfo': _groups.get(group)} + def main(): ctx = zmq.Context() s = Server(ctx)