github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Log methods add file name and line number.

Browse Source
This commit is contained in:
Slava Kim
2013-05-23 11:56:08 -07:00
parent 361d121934
commit 8db6438fb5
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/logging/logging.js
View File

@@ -56,6 +56,32 @@ var logInBrowser = function (obj) {
}
};
var getCallerDetails = function () {
var e = new Error();
// now magic will happen: get line number from callstack
var lines = e.stack.split('\n');
var line = lines[2];
var index = 0;
// Pick the first line outside logging package
while (line.indexOf('/packages/logging.js') !== -1)
line = lines[++index];
var details = {};
details.line = line.split(':')[1];
// line can be in two formats depending on function description availability:
// 0) at functionNumber (/filePath/file.js:line:position)
// 1) at /filePath/file.js:line:position
details.fileName = line.indexOf('(') === -1 ?
line.split('at ')[1] :
line.split('(')[1];
details.fileName = details.fileName.split(':')[0]; // get rid of line number
details.fileName = details.fileName.split('/').slice(-1)[0];
return details;
};
_.each(['debug', 'info', 'warn', 'error'], function (level) {
// @param arg {String|Object}
Log[level] = function (arg) {
@@ -65,7 +91,8 @@ _.each(['debug', 'info', 'warn', 'error'], function (level) {
intercepted = true;
}
var obj = (typeof arg === 'string') ? {message: arg} : arg;
var obj = (typeof arg === 'string') ?
_.extend(getCallerDetails(), {message: arg}): arg;
_.each(RESTRICTED_KEYS, function (key) {
if (obj[key])