github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-19 02:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up makeRequest, so it copes with analytics.url being un-configured.

Browse source
This commit is contained in:
Shane Kilkelly 2016-11-16 14:40:38 +00:00
parent 5b3cd7ed2b
commit f9774141b1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/app/coffee/Features/Analytics/AnalyticsManager.coffee
View file

@ -4,8 +4,10 @@ _ = require "underscore"
request = require "request" request = require "request"
makeRequest: (opts, callback)-> makeRequest = (opts, callback)->
if settings.apis?.analytics?.url? if settings.apis?.analytics?.url?
urlPath = opts.url
opts.url = "#{settings.apis.analytics.url}#{urlPath}"
request opts, callback request opts, callback
else else
callback() callback()
@ -25,7 +27,7 @@ module.exports =
json:true json:true
method:"POST" method:"POST"
timeout:1000 timeout:1000
url: "#{settings.apis.analytics.url}/user/#{user_id}/event" url: "/user/#{user_id}/event"
makeRequest opts, callback makeRequest opts, callback
@ -36,11 +38,11 @@ module.exports =
json:true json:true
method:"POST" method:"POST"
timeout:1000 timeout:1000
url: "#{settings.apis.analytics.url}/user/#{user_id}/event/last_occurnace" url: "/user/#{user_id}/event/last_occurnace"
makeRequest opts, (err, response, body)-> makeRequest opts, (err, response, body)->
if err? if err?
console.log response, opts console.log response, opts
logger.err {user_id, err}, "error getting last occurance of event" logger.err {user_id, err}, "error getting last occurance of event"
return callback err return callback err
else else
return callback null, body return callback null, body