diff --git a/ee/utilities/servers/websocket-cluster.js b/ee/utilities/servers/websocket-cluster.js index f21755f9b..59ab97927 100644 --- a/ee/utilities/servers/websocket-cluster.js +++ b/ee/utilities/servers/websocket-cluster.js @@ -268,9 +268,9 @@ function extractSessionInfo(socket) { socket.handshake.query.sessionInfo.userDevice = ua.device.model || null; socket.handshake.query.sessionInfo.userDeviceType = ua.device.type || 'desktop'; socket.handshake.query.sessionInfo.userCountry = null; - if (geoip !== null) { + if (geoip() !== null) { debug && console.log(`looking for location of ${socket.handshake.headers['x-forwarded-for'] || socket.handshake.address}`); - let country = geoip.country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); + let country = geoip().country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); socket.handshake.query.sessionInfo.userCountry = country.country.isoCode; } } diff --git a/ee/utilities/servers/websocket.js b/ee/utilities/servers/websocket.js index a5126a78f..a20f23078 100644 --- a/ee/utilities/servers/websocket.js +++ b/ee/utilities/servers/websocket.js @@ -247,9 +247,9 @@ function extractSessionInfo(socket) { socket.handshake.query.sessionInfo.userDevice = ua.device.model || null; socket.handshake.query.sessionInfo.userDeviceType = ua.device.type || 'desktop'; socket.handshake.query.sessionInfo.userCountry = null; - if (geoip !== null) { + if (geoip() !== null) { debug && console.log(`looking for location of ${socket.handshake.headers['x-forwarded-for'] || socket.handshake.address}`); - let country = geoip.country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); + let country = geoip().country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); socket.handshake.query.sessionInfo.userCountry = country.country.isoCode; } } diff --git a/utilities/servers/websocket.js b/utilities/servers/websocket.js index 2c4d22342..2d5b6fc4e 100644 --- a/utilities/servers/websocket.js +++ b/utilities/servers/websocket.js @@ -218,9 +218,9 @@ function extractSessionInfo(socket) { socket.handshake.query.sessionInfo.userDevice = ua.device.model || null; socket.handshake.query.sessionInfo.userDeviceType = ua.device.type || 'desktop'; socket.handshake.query.sessionInfo.userCountry = null; - if (geoip !== null) { + if (geoip() !== null) { debug && console.log(`looking for location of ${socket.handshake.headers['x-forwarded-for'] || socket.handshake.address}`); - let country = geoip.country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); + let country = geoip().country(socket.handshake.headers['x-forwarded-for'] || socket.handshake.address); socket.handshake.query.sessionInfo.userCountry = country.country.isoCode; } } diff --git a/utilities/utils/geoIP.js b/utilities/utils/geoIP.js index 5bfcfd0e8..ae3955101 100644 --- a/utilities/utils/geoIP.js +++ b/utilities/utils/geoIP.js @@ -13,4 +13,8 @@ if (process.env.MAXMINDDB_FILE !== undefined) { console.error("!!! please provide a valid value for MAXMINDDB_FILE env var."); } -module.exports = {geoip} \ No newline at end of file +module.exports = { + geoip: () => { + return geoip; + } +} \ No newline at end of file