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

Revert "increased timeout for geoip to 3 seconds"

Browse source 
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
This commit is contained in:
Henry Oswald 2014-11-25 13:10:00 +00:00
parent d91064a369
commit 3bae278c92
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ module.exports = GeoIpLookup =
ip = ip.trim().split(" ")[0]
opts =
url: "#{settings.apis.geoIpLookup.url}/#{ip}"
timeout: 3000
timeout: 1000
json:true
logger.log ip:ip, opts:opts, "getting geo ip details"
request.get opts, (err, res, ipDetails)->

4
services/web/test/UnitTests/coffee/infrastructure/GeoIpLookupTests.coffee
View file

@ -43,7 +43,7 @@ describe "GeoIpLookup", ->
it "should request the details using the ip", (done)->
@GeoIpLookup.getDetails @ipAddress, (err)=>
@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:3000, json:true}).should.equal true
@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:1000, json:true}).should.equal true
done()
it "should return the ip details", (done)->
@ -53,7 +53,7 @@ describe "GeoIpLookup", ->
it "should take the first ip in the string", (done)->
@GeoIpLookup.getDetails " #{@ipAddress} 456.312.452.102 432.433.888.234", (err)=>
@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:3000, json:true}).should.equal true
@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:1000, json:true}).should.equal true
done()
describe "getCurrencyCode", ->