summaryrefslogtreecommitdiff
path: root/app/server/bridge.js
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-02 13:40:43 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-02 13:40:43 +0200
commit015c9b3e7ec8b20308fc604d925a6e9c188aa42e (patch)
tree54dab9950e6dd73e1333f2e080cb123d4c1d9c1e /app/server/bridge.js
parenta6a529a5757417906f6df60ca7557fac3a380966 (diff)
pull in proxy from stone island
Diffstat (limited to 'app/server/bridge.js')
-rw-r--r--app/server/bridge.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/server/bridge.js b/app/server/bridge.js
index 9405dad..c2deb20 100644
--- a/app/server/bridge.js
+++ b/app/server/bridge.js
@@ -1,4 +1,5 @@
import { server, io } from './site'
+import * as proxy from './proxy'
let relay_connected = false
@@ -10,6 +11,7 @@ export const relay = (() => {
if (process.env.EXPRESS_CONNECTS_TO_RELAY === 'true') {
console.log('Connecting to relay on ' + process.env.RELAY_REMOTE)
relay = require('socket.io-client').connect(process.env.RELAY_REMOTE)
+ proxy.attach(server)
bind_relay(relay)
} else {
relay = io.of('/relay')