diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-04-13 23:53:06 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-04-14 00:11:35 +0300 |
| commit | 8c317ac88f07e275bf79997389bc791ea43e44dc (patch) | |
| tree | a2fd53f953d28e19021cd675eba9804a2e0cf756 /src/server/rz_mesh.py | |
| parent | 499965a08cfafc25f12d31ef631832b39d24f673 (diff) | |
[peer/host addr] rz_mesh: non socket.io upgrade handling (still broken)
Diffstat (limited to 'src/server/rz_mesh.py')
| -rw-r--r-- | src/server/rz_mesh.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/rz_mesh.py b/src/server/rz_mesh.py index a70adf4b..4573aeb8 100644 --- a/src/server/rz_mesh.py +++ b/src/server/rz_mesh.py @@ -167,18 +167,18 @@ def init_ws_interface(cfg, kernel, flask_webapp): def socketio_route_handler(url_path): - # FIXME: ws upgrade process for non socketio clients - if None == request.environ.get('socketio'): + # FIXME: rm if unused + if None == request.environ.get('socketio'): # attempt ws upgrade process for non socketio clients header__upgrade = request.headers.get('Upgrade') if 'websocket' == header__upgrade: - remote_addr = request.environ['REMOTE_ADDR'] - remote_port = request.environ['REMOTE_PORT'] - - log.debug('ws: \'Upgrade: websocket\' header detected, serving \'101\': remote-socket-addr: %s:%s' % (remote_addr, remote_port)) resp = make_response__http__empty(101) # 'switching protocols' HTTP status code resp.headers['Upgrade'] = 'websocket' resp.headers['Connection'] = 'Upgrade' + + rmt_addr, rmt_port = request.req_probe__sock_addr.probe_client_socket_addr__ws_conn(request.environ) + log.debug('ws: \'Upgrade: websocket\' header detected, serving \'101\': remote-socket-addr: %s:%s' % (rmt_addr, rmt_port)) + return resp else: raise Exception('ws: failed to obtain socketio object from WSGI environment') @@ -204,7 +204,7 @@ def init_ws_interface(cfg, kernel, flask_webapp): for r_assoc in rzdoc_r_set: cast_set.append(r_assoc) - log.debug('ws: rzdoc reader cast: msg: \'%s\': rzdoc: %s, cast-size ~= %d' % (pkt.get('name'), + log.debug('ws: rzdoc cast: msg: \'%s\': rzdoc: %s, cast-size ~= %d' % (pkt.get('name'), rzdoc.name, len(cast_set))) for r_assoc in cast_set: |