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

minor tweaks to log format

Browse Source
This commit is contained in:
Avital Oliver
2013-05-29 14:10:29 -07:00
parent 48c1b9bb48
commit 34157ebce4
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/logging/logging.js
View File

@@ -188,23 +188,21 @@ Log.format = function (obj, options) {
var appInfo = '';
if (appName) appInfo += appName;
if (originApp && originApp !== appName) appInfo += ':' + originApp;
if (appInfo) appInfo = ' [' + appInfo + ']';
if (originApp && originApp !== appName) appInfo += ' via ' + originApp;
if (appInfo) appInfo = '[' + appInfo + '] ';
var sourceInfo = (file && lineNumber) ?
['(', (program ? program + ':' : ''), file, ':', lineNumber, ')'].join('')
['(', (program ? program + ':' : ''), file, ':', lineNumber, ') '].join('')
: '';
if (sourceInfo && !appInfo)
sourceInfo = ' ' + sourceInfo;
var stderrIndicator = stderr ? ' (STDERR)' : '';
var stderrIndicator = stderr ? '(STDERR) ' : '';
var metaPrefix = [
level.charAt(0).toUpperCase(),
dateStamp,
'-',
timeStamp,
timeInexact ? '?' : '',
timeInexact ? '?' : ' ',
appInfo,
sourceInfo,
stderrIndicator].join('');
@@ -215,7 +213,6 @@ Log.format = function (obj, options) {
};
return prettify(metaPrefix, META_COLOR)
+ ' '
+ prettify(message, LEVEL_COLORS[level]);
};

6
packages/logging/logging_test.js
View File

@@ -76,7 +76,7 @@ Tinytest.add("logging - format", function (test) {
test.equal(
Log.format({message: "message", time: time, timeInexact: true, level: level}),
level.charAt(0).toUpperCase() + "20120908-07:06:05.004? message");
level.charAt(0).toUpperCase() + "20120908-07:06:05.004?message");
test.equal(
Log.format({foo1: "bar1", foo2: "bar2", time: time, level: level}),
@@ -89,7 +89,7 @@ Tinytest.add("logging - format", function (test) {
// Has everything except stderr field
test.equal(
Log.format({message: "message", foo: "bar", time: time, level: level, file: "app.js", line:42, app: "myApp", originApp: "proxy", program: "server"}),
level.charAt(0).toUpperCase() + '20120908-07:06:05.004 [myApp:proxy](server:app.js:42) message {\"foo\":\"bar\"}');
level.charAt(0).toUpperCase() + '20120908-07:06:05.004 [myApp via proxy] (server:app.js:42) message {\"foo\":\"bar\"}');
// stderr
test.equal(
@@ -102,7 +102,7 @@ Tinytest.add("logging - format", function (test) {
level.charAt(0).toUpperCase() + '20120908-07:06:05.004 [app] message');
test.equal(
Log.format({message: "message", time: time, level: level, app: "app", originApp: "proxy"}),
level.charAt(0).toUpperCase() + '20120908-07:06:05.004 [app:proxy] message');
level.charAt(0).toUpperCase() + '20120908-07:06:05.004 [app via proxy] message');
// source info
test.equal(