github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form

Browse source
This commit is contained in:
Paulo Reis 2016-08-19 16:48:33 +01:00
commit 92bc411df5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/infrastructure/GeoIpLookup.coffee
View file

@ -2,6 +2,7 @@ request = require("request")
settings = require("settings-sharelatex") settings = require("settings-sharelatex")
_ = require("underscore") _ = require("underscore")
logger = require("logger-sharelatex") logger = require("logger-sharelatex")
URL = require("url")
currencyMappings = { currencyMappings = {
"GB":"GBP" "GB":"GBP"
@ -31,7 +32,7 @@ module.exports = GeoIpLookup =
return callback(e) return callback(e)
ip = ip.trim().split(" ")[0] ip = ip.trim().split(" ")[0]
opts = opts =
url: "#{settings.apis.geoIpLookup.url}/#{ip}" url: URL.resolve(settings.apis.geoIpLookup.url,ip)
timeout: 1000 timeout: 1000
json:true json:true
logger.log ip:ip, opts:opts, "getting geo ip details" logger.log ip:ip, opts:opts, "getting geo ip details"