diff --git a/lib/agent/providers/geo/darwin/index.js b/lib/agent/providers/geo/darwin/index.js index 790db894a..fdbec4c60 100644 --- a/lib/agent/providers/geo/darwin/index.js +++ b/lib/agent/providers/geo/darwin/index.js @@ -8,7 +8,6 @@ var join = require('path').join, var bin = join(__dirname, 'bin', 'whereami'); var get_using_corelocation = function(cb) { - child_process.exec(bin, function(err, out) { if (err) return cb(err); @@ -31,17 +30,14 @@ var get_using_corelocation = function(cb) { } cb(null, res); - }) - + }); } exports.get_location = function(cb) { - system.get_os_version(function(err, version) { if (version && gte(version, "10.6.0")) return get_using_corelocation(cb); cb(new Error('CoreLocation not suppored in OSX ' + version)) }); - } \ No newline at end of file diff --git a/lib/agent/providers/geo/linux/index.js b/lib/agent/providers/geo/linux/index.js index 92990b787..77e6aa40a 100644 --- a/lib/agent/providers/geo/linux/index.js +++ b/lib/agent/providers/geo/linux/index.js @@ -42,7 +42,6 @@ function get_command_one(provider) { return [bin, '--print-reply', '--dest=' + service, path, command].join(' '); } - function geoclue_one(provider, cb) { var cmd = get_command_one(provider); diff --git a/lib/agent/providers/geo/strategies.js b/lib/agent/providers/geo/strategies.js index cc64d1ca5..5560d738b 100644 --- a/lib/agent/providers/geo/strategies.js +++ b/lib/agent/providers/geo/strategies.js @@ -1,14 +1,13 @@ "use strict" var join = require('path').join, - needle = require('needle'), - get_agent = require('random-ua').generate, - platform = require(join(__dirname, process.platform)), - providers = require('./../../providers'), - logger = require('../../common').logger.prefix('geo'); + needle = require('needle'), + get_agent = require('random-ua').generate, + platform = require(join(__dirname, process.platform)), + providers = require('./../../providers'), + logger = require('../../common').logger.prefix('geo'); function geoip(cb) { - logger.debug("Getting location via geoip"); needle.get('http://ipinfo.io/geo', function(err, resp, body) { @@ -25,11 +24,10 @@ function geoip(cb) { } cb(null, res); - }) + }); } function google(cb) { - logger.debug("Getting location via google api"); providers.get('access_points_list', function(err, list) { @@ -64,7 +62,6 @@ function google(cb) { } function process_response(body, cb) { - logger.debug("Processing Google API response"); var coords; @@ -93,11 +90,9 @@ function google(cb) { return cb(null, data); } - } function geonative(cb) { - logger.debug("Getting location via native geoloc"); platform.get_location(function(err, res) {