freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow to specify nodes.json-URLs for multiple communities / domains.

Browse source
This commit is contained in:
baldo 2017-03-03 22:02:26 +01:00
parent e7a362b020
commit 5086d8c71f
4 changed files with 89 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -153,7 +153,7 @@ Dann die `config.json` anpassen nach belieben. Es gibt die folgenden Konfigurati
} }
``` ```
* **`server.map.nodesJsonUrl`** URL der `nodes.json` des meshviewers, z. B.: `"http://musterstadt.freifunk.net/nodes.json"` * **`server.map.nodesJsonUrl`** URL der `nodes.json` des meshviewers (kann eine URL oder eine Liste von URLs sein), z. B.: `["http://musterstadt.freifunk.net/nodes.json"]`
* **`client.community.name`** Name der Freifunk-Community, z. B.: `"Freifunk Musterstadt"` * **`client.community.name`** Name der Freifunk-Community, z. B.: `"Freifunk Musterstadt"`
* **`client.community.domain`** Domain der Freifunk-Community, z. B.: `"musterstadt.freifunk.net"` * **`client.community.domain`** Domain der Freifunk-Community, z. B.: `"musterstadt.freifunk.net"`

2
config.json.example
View file

@ -34,7 +34,7 @@
}, },
"map": { "map": {
"nodesJsonUrl": "http://musterstadt.freifunk.net/nodes.json" "nodesJsonUrl": ["http://musterstadt.freifunk.net/nodes.json"]
} }
}, },
"client": { "client": {

2
server/config.js
View file

@ -89,7 +89,7 @@ var defaultConfig = {
}, },
map: { map: {
nodesJsonUrl: 'http://map.musterstadt.freifunk.net/nodes.json' nodesJsonUrl: ['http://map.musterstadt.freifunk.net/nodes.json']
} }
}, },
client: { client: {

164
server/services/monitoringService.js
View file

@ -418,6 +418,87 @@ angular.module('ffffng')
}); });
} }
function retrieveNodeInformationForUrl(url, callback) {
Logger.tag('monitoring', 'information-retrieval').debug('Retrieving nodes.json: %s', url);
request(url, function (err, response, body) {
if (err) {
return callback(err);
}
if (response.statusCode !== 200) {
return callback(new Error(
'Could not download nodes.json from ' + url + ': ' +
response.statusCode + ' - ' + response.statusMessage
));
}
parseNodesJson(body, function (err, data) {
if (err) {
return callback(err);
}
if (previousImportTimestamp !== null && !data.importTimestamp.isAfter(previousImportTimestamp)) {
Logger
.tag('monitoring', 'information-retrieval')
.debug(
'No new data, skipping. Current timestamp: %s, previous timestamp: %s',
data.importTimestamp.format(),
previousImportTimestamp.format()
);
return callback();
}
previousImportTimestamp = data.importTimestamp;
// We do not parallelize here as the sqlite will start slowing down and blocking with too many
// parallel queries. This has resulted in blocking other requests too and thus in a major slowdonw.
async.eachSeries(
data.nodes,
function (nodeData, nodeCallback) {
Logger.tag('monitoring', 'information-retrieval').debug('Importing: %s', nodeData.mac);
NodeService.getNodeDataByMac(nodeData.mac, function (err, node) {
if (err) {
Logger
.tag('monitoring', 'information-retrieval')
.error('Error importing: ' + nodeData.mac, err);
return nodeCallback(err);
}
if (!node) {
Logger
.tag('monitoring', 'information-retrieval')
.debug('Unknown node, skipping: %s', nodeData.mac);
return nodeCallback(null);
}
storeNodeInformation(nodeData, node, function (err) {
if (err) {
Logger
.tag('monitoring', 'information-retrieval')
.debug('Could not update / deleting node data: %s', nodeData.mac, err);
return nodeCallback(err);
}
Logger
.tag('monitoring', 'information-retrieval')
.debug('Updating / deleting node data done: %s', nodeData.mac);
nodeCallback();
});
});
},
function (err) {
if (err) {
return callback(err);
}
markMissingNodesAsOffline(data.nodes, callback);
}
);
});
});
}
return { return {
getAll: function (restParams, callback) { getAll: function (restParams, callback) {
var sortFields = [ var sortFields = [
@ -554,85 +635,12 @@ angular.module('ffffng')
}, },
retrieveNodeInformation: function (callback) { retrieveNodeInformation: function (callback) {
var url = config.server.map.nodesJsonUrl; var urls = config.server.map.nodesJsonUrl;
Logger.tag('monitoring', 'information-retrieval').debug('Retrieving nodes.json: %s', url); if (_.isString(urls)) {
request(url, function (err, response, body) { urls = [urls];
if (err) { }
return callback(err);
}
if (response.statusCode !== 200) { async.eachSeries(urls, retrieveNodeInformationForUrl, callback);
return callback(new Error(
'Could not download nodes.json from ' + url + ': ' +
response.statusCode + ' - ' + response.statusMessage
));
}
parseNodesJson(body, function (err, data) {
if (err) {
return callback(err);
}
if (previousImportTimestamp !== null && !data.importTimestamp.isAfter(previousImportTimestamp)) {
Logger
.tag('monitoring', 'information-retrieval')
.debug(
'No new data, skipping. Current timestamp: %s, previous timestamp: %s',
data.importTimestamp.format(),
previousImportTimestamp.format()
);
return callback();
}
previousImportTimestamp = data.importTimestamp;
// We do not parallelize here as the sqlite will start slowing down and blocking with too many
// parallel queries. This has resulted in blocking other requests too and thus in a major slowdonw.
async.eachSeries(
data.nodes,
function (nodeData, nodeCallback) {
Logger.tag('monitoring', 'information-retrieval').debug('Importing: %s', nodeData.mac);
NodeService.getNodeDataByMac(nodeData.mac, function (err, node) {
if (err) {
Logger
.tag('monitoring', 'information-retrieval')
.error('Error importing: ' + nodeData.mac, err);
return nodeCallback(err);
}
if (!node) {
Logger
.tag('monitoring', 'information-retrieval')
.debug('Unknown node, skipping: %s', nodeData.mac);
return nodeCallback(null);
}
storeNodeInformation(nodeData, node, function (err) {
if (err) {
Logger
.tag('monitoring', 'information-retrieval')
.debug('Could not update / deleting node data: %s', nodeData.mac, err);
return nodeCallback(err);
}
Logger
.tag('monitoring', 'information-retrieval')
.debug('Updating / deleting node data done: %s', nodeData.mac);
nodeCallback();
});
});
},
function (err) {
if (err) {
return callback(err);
}
markMissingNodesAsOffline(data.nodes, callback);
}
);
});
});
}, },
sendMonitoringMails: function (callback) { sendMonitoringMails: function (callback) {