pelias
/
api
mirror of https://github.com/pelias/api.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #1185 from pelias/move-logging-to-debug 

Move lots of logging from info to debug
pull/1188/head
Julian Simioni 6 years ago committed by GitHub
parent
16760795e9 800eb8ca03
commit
fd003dc76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      controller/placeholder.js
  2. 4
      middleware/dedupe.js
  3. 3
      middleware/requestLanguage.js
  4. 4
      query/search.js
  5. 26
      test/unit/controller/placeholder.js

2
controller/placeholder.js
Unescape View File

@ -265,7 +265,7 @@ function setup(placeholderService, do_geometric_filters_apply, should_execute) {
`[result_count:${_.defaultTo(res.data, []).length}]` `[result_count:${_.defaultTo(res.data, []).length}]`
]; ];
logger.info(messageParts.join(' ')); logger.debug(messageParts.join(' '));
debugLog.push(req, messageParts[1].slice(1,-1)); debugLog.push(req, messageParts[1].slice(1,-1));
debugLog.push(req, res.data); debugLog.push(req, res.data);
} }

4
middleware/dedupe.js
Unescape View File

@ -36,7 +36,7 @@ function dedupeResults(req, res, next) {
// since the order in which Elasticsearch returns identical text matches is arbitrary // since the order in which Elasticsearch returns identical text matches is arbitrary
// of course, if the new one is preferred we should replace previous with new // of course, if the new one is preferred we should replace previous with new
else if (isPreferred(uniqueResults[dupeIndex], hit)) { else if (isPreferred(uniqueResults[dupeIndex], hit)) {
logger.info('[dupe][replacing]', { logger.debug('[dupe][replacing]', {
query: req.clean.text, query: req.clean.text,
previous: uniqueResults[dupeIndex].source, previous: uniqueResults[dupeIndex].source,
hit: field.getStringValue(hit.name.default) + ' ' + hit.source + ':' + hit._id hit: field.getStringValue(hit.name.default) + ' ' + hit.source + ':' + hit._id
@ -46,7 +46,7 @@ function dedupeResults(req, res, next) {
} }
// if not preferred over existing, just log and move on // if not preferred over existing, just log and move on
else { else {
logger.info('[dupe][skipping]', { logger.debug('[dupe][skipping]', {
query: req.clean.text, query: req.clean.text,
previous: uniqueResults[dupeIndex].source, previous: uniqueResults[dupeIndex].source,
hit: field.getStringValue(hit.name.default) + ' ' + hit.source + ':' + hit._id hit: field.getStringValue(hit.name.default) + ' ' + hit.source + ':' + hit._id

3
middleware/requestLanguage.js
Unescape View File

@ -101,8 +101,7 @@ module.exports = function middleware( req, res, next ){
defaulted: req.language.defaulted defaulted: req.language.defaulted
}; };
// logging logger.debug( '[lang] \'%s\' via \'%s\'', lang.iso6391, via );
logger.info( '[lang] \'%s\' via \'%s\'', lang.iso6391, via );
next(); next();
}; };

4
query/search.js
Unescape View File

@ -120,10 +120,10 @@ function generateQuery( clean ){
//console.log(JSON.stringify(q, null, 2)); //console.log(JSON.stringify(q, null, 2));
if (q !== undefined) { if (q !== undefined) {
logger.info(logStr); logger.debug(logStr);
} }
else { else {
logger.info('[parser:libpostal] query type not supported'); logger.debug('[parser:libpostal] query type not supported');
} }
return q; return q;

26
test/unit/controller/placeholder.js
Unescape View File

@ -291,7 +291,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:2]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:2]'));
t.end(); t.end();
}); });
@ -355,7 +355,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:1]'));
t.end(); t.end();
}); });
@ -415,7 +415,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:1]'));
t.end(); t.end();
}); });
@ -473,7 +473,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:1]'));
t.end(); t.end();
}); });
@ -538,7 +538,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:1]'));
}); });
}); });
@ -607,7 +607,7 @@ module.exports.tests.success = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:1]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:1]'));
t.end(); t.end();
}); });
@ -1403,7 +1403,7 @@ module.exports.tests.result_filtering = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:3]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:3]'));
t.end(); t.end();
}); });
@ -1538,7 +1538,7 @@ module.exports.tests.result_filtering = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:3]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:3]'));
t.end(); t.end();
}); });
@ -1680,7 +1680,7 @@ module.exports.tests.result_filtering = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:2]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:2]'));
t.end(); t.end();
}); });
@ -1852,7 +1852,7 @@ module.exports.tests.result_filtering = (test, common) => {
}; };
t.deepEquals(res, expected_res); t.deepEquals(res, expected_res);
t.ok(logger.isInfoMessage('[controller:placeholder] [result_count:3]')); t.ok(logger.isDebugMessage('[controller:placeholder] [result_count:3]'));
t.end(); t.end();
}); });
@ -2356,7 +2356,7 @@ module.exports.tests.error_conditions = (test, common) => {
controller(req, res, () => { controller(req, res, () => {
t.deepEquals(res, {}, 'res should not have been modified'); t.deepEquals(res, {}, 'res should not have been modified');
t.deepEquals(req.errors, ['placeholder service error']); t.deepEquals(req.errors, ['placeholder service error']);
t.notOk(logger.isInfoMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/)); t.notOk(logger.isDebugMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/));
t.end(); t.end();
}); });
@ -2385,7 +2385,7 @@ module.exports.tests.error_conditions = (test, common) => {
controller(req, res, () => { controller(req, res, () => {
t.deepEquals(res, {}, 'res should not have been modified'); t.deepEquals(res, {}, 'res should not have been modified');
t.deepEquals(req.errors, ['placeholder service error']); t.deepEquals(req.errors, ['placeholder service error']);
t.notOk(logger.isInfoMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/)); t.notOk(logger.isDebugMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/));
t.end(); t.end();
}); });
@ -2410,7 +2410,7 @@ module.exports.tests.error_conditions = (test, common) => {
controller(req, res, () => { controller(req, res, () => {
t.deepEquals(res, {}, 'res should not have been modified'); t.deepEquals(res, {}, 'res should not have been modified');
t.deepEquals(req.errors, [{ error_key: 'error_value' }]); t.deepEquals(req.errors, [{ error_key: 'error_value' }]);
t.notOk(logger.isInfoMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/)); t.notOk(logger.isDebugMessage(/\\[controller:placeholder\\] \\[result_count:\\d+\\]/));
t.end(); t.end();
}); });

Write Preview
Loading…
Cancel
Save