From 1651ecbbd6eb6f8a2f152cf7aa7d9bf4be9c20af Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 24 May 2013 16:22:43 -0700
Subject: [PATCH] Logging 'originApp' field if it differs from 'app'

---
 packages/logging/logging.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/logging/logging.js b/packages/logging/logging.js
index 84843266b1..775e84ee59 100644
--- a/packages/logging/logging.js
+++ b/packages/logging/logging.js
@@ -40,7 +40,8 @@ var LEVEL_COLORS = {
 var META_COLOR = 'magenta';
 
 // XXX package
-var RESTRICTED_KEYS = ['time', 'timeInexact', 'level', 'file', 'line', 'app'];
+var RESTRICTED_KEYS = ['time', 'timeInexact', 'level', 'file', 'line', 'app',
+                        'originApp'];
 
 var logInBrowser = function (obj) {
   var str = Log.format(obj);
@@ -156,7 +157,7 @@ Log.format = function (obj, options) {
   var file = obj.file;
   var lineNumber = obj.line;
   var appName = obj.app|| '';
-  if (appName) appName = '[' + appName + ']';
+  var originApp = obj.originApp;
 
   _.each(RESTRICTED_KEYS, function(key) {
     delete obj[key];
@@ -184,6 +185,10 @@ Log.format = function (obj, options) {
         pad3(time.getMilliseconds());
   var sourceInfo = (file && lineNumber) ?
                    '(' + file + ':' + lineNumber + ')' : '';
+  var appInfo = '';
+  if (appName) appInfo += appName;
+  if (originApp && originApp !== appName) appInfo += ':' + originApp;
+  if (appInfo) appInfo = '[' + appInfo + ']';
 
   var metaPrefix = [
     level.charAt(0).toUpperCase(),
@@ -191,7 +196,7 @@ Log.format = function (obj, options) {
     '-',
     timeStamp,
     timeInexact ? '?' : ' ',
-    appName,
+    appInfo,
     sourceInfo].join('');
 
   var prettify = function (line, color) {