Merge branch 'dev'

wvivianjia · wvivianjia · commit 70f016a6bf18 · 2015-05-05T17:26:20.000-07:00
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+Version 0.1.14
+--------------
+Release Date: 5 May 2015
+	* Add timestamp to the log entries.
+
 Version 0.1.13
 --------------
 Release Date: 1 May 2015
diff --git a/lib/log.js b/lib/log.js
@@ -149,8 +149,9 @@ Logger.prototype.log = function(level, message, error) {
     }
 
     var correlationId = this._logContext.correlationId || '<no correlation id>';
+    var timeStamp = new Date().toUTCString();
 
-    var formattedMessage = correlationId + ' - ' + this._componentName + ': ' + LEVEL_STRING_MAP[level] + ' ' + message;
+    var formattedMessage = timeStamp + ':' + correlationId + ' - ' + this._componentName + ': ' + LEVEL_STRING_MAP[level] + ' ' + message;
     if (error) {
       formattedMessage += '\nStack:\n' + error.stack;
     }
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "type": "git",
     "url": "https://github.com/MSOpenTech/azure-activedirectory-library-for-nodejs.git"
   },
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Windows Azure Active Directory Client Library for node",
   "keywords": [ "node", "azure", "AAD", "adal", "adfs", "oauth" ],
   "main": "./lib/adal.js",

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,9 @@ Logger.prototype.log = function(level, message, error) {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`var correlationId = this._logContext.correlationId \|\| '<no correlation id>';`
	`152`	`+ var timeStamp = new Date().toUTCString();`
`152`	`153`
`153`		`- var formattedMessage = correlationId + ' - ' + this._componentName + ': ' + LEVEL_STRING_MAP[level] + ' ' + message;`
	`154`	`+ var formattedMessage = timeStamp + ':' + correlationId + ' - ' + this._componentName + ': ' + LEVEL_STRING_MAP[level] + ' ' + message;`
`154`	`155`	`if (error) {`
`155`	`156`	`formattedMessage += '\nStack:\n' + error.stack;`
`156`	`157`	`}`