diff --git a/api/.chalice/config.json b/api/.chalice/config.json index c3bd72cb6..b6f821e3a 100644 --- a/api/.chalice/config.json +++ b/api/.chalice/config.json @@ -33,7 +33,7 @@ "sourcemaps_reader": "http://utilities-openreplay.app.svc.cluster.local:9000/sourcemaps", "sourcemaps_bucket": "sourcemaps", "js_cache_bucket": "sessions-assets", - "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/peers", + "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/%s/peers", "async_Token": "", "EMAIL_HOST": "", "EMAIL_PORT": "587", diff --git a/api/chalicelib/core/assist.py b/api/chalicelib/core/assist.py index 4b57145e8..dbfe8269b 100644 --- a/api/chalicelib/core/assist.py +++ b/api/chalicelib/core/assist.py @@ -21,7 +21,7 @@ SESSION_PROJECTION_COLS = """s.project_id, def get_live_sessions(project_id, filters=None): project_key = projects.get_project_key(project_id) - connected_peers = requests.get(environ["peers"] + f"/{project_key}") + connected_peers = requests.get(environ["peers"] % environ["S3_KEY"] + f"/{project_key}") if connected_peers.status_code != 200: print("!! issue with the peer-server") print(connected_peers.text) @@ -65,7 +65,7 @@ def get_live_sessions(project_id, filters=None): def is_live(project_id, session_id, project_key=None): if project_key is None: project_key = projects.get_project_key(project_id) - connected_peers = requests.get(environ["peers"] + f"/{project_key}") + connected_peers = requests.get(environ["peers"] % environ["S3_KEY"] + f"/{project_key}") if connected_peers.status_code != 200: print("!! issue with the peer-server") print(connected_peers.text) diff --git a/ee/api/.chalice/config.json b/ee/api/.chalice/config.json index 55ace4632..7705f0fbd 100644 --- a/ee/api/.chalice/config.json +++ b/ee/api/.chalice/config.json @@ -35,7 +35,7 @@ "put_S3_TTL": "20", "sourcemaps_reader": "http://utilities-openreplay.app.svc.cluster.local:9000/sourcemaps", "sourcemaps_bucket": "sourcemaps", - "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/peers", + "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/%s/peers", "js_cache_bucket": "sessions-assets", "async_Token": "", "EMAIL_HOST": "", diff --git a/utilities/servers/peerjs-server.js b/utilities/servers/peerjs-server.js index ef6556531..a103764c3 100644 --- a/utilities/servers/peerjs-server.js +++ b/utilities/servers/peerjs-server.js @@ -48,13 +48,13 @@ const peerError = (error) => { } -peerRouter.get('/peers', function (req, res) { +peerRouter.get(`/${process.env.S3_KEY}/peers`, function (req, res) { console.log("looking for all available sessions"); res.statusCode = 200; res.setHeader('Content-Type', 'application/json'); res.end(JSON.stringify({"data": connectedPeers})); }); -peerRouter.get('/peers/:projectKey', function (req, res) { +peerRouter.get(`/${process.env.S3_KEY}/peers/:projectKey`, function (req, res) { console.log(`looking for available sessions for ${req.params.projectKey}`); res.statusCode = 200; res.setHeader('Content-Type', 'application/json');