Merge branch 'master' of ssh://github.com/nylas/k2

package.json

@@ -18,6 +18,7 @@
   },
   "devDependencies": {
     "babel-eslint": "6.x",
+    "bunyan-prettystream": "^0.1.3",
     "eslint": "2.x",
     "eslint-config-airbnb": "8.x",
     "eslint-plugin-import": "1.x",
@@ -27,8 +28,7 @@
     "sqlite3": "https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep-v3.1.4.tar.gz"
   },
   "scripts": {
-    "start": "pm2 kill && pm2 start ./pm2-dev.yml --watch && pm2 logs --raw | bunyan -o short",
-    "logs": "pm2 logs --raw | bunyan -o short",
+    "start": "pm2 start ./pm2-dev.yml --no-daemon",
     "stop": "pm2 kill",
     "postinstall": "lerna bootstrap"
   },

packages/nylas-api/app.js

@@ -1,4 +1,4 @@
-require('newrelic');
+// require('newrelic');
 
 const Hapi = require('hapi');
 const HapiSwagger = require('hapi-swagger');

packages/nylas-core/logger.js

@@ -1,17 +1,25 @@
 const bunyan = require('bunyan')
 const createCWStream = require('bunyan-cloudwatch')
+const PrettyStream = require('bunyan-prettystream');
 const NODE_ENV = process.env.NODE_ENV || 'unknown'
 
 
 function getLogStreams(name, env) {
+  if (env === 'development') {
+    const prettyStdOut = new PrettyStream();
+    prettyStdOut.pipe(process.stdout);
+    const stdoutStream = {
+      type: 'raw',
+      level: 'debug',
+      stream: prettyStdOut,
+    }
+    return [stdoutStream]
+  }
+
   const stdoutStream = {
     stream: process.stdout,
     level: 'info',
   }
-  if (env === 'development') {
-    return [stdoutStream]
-  }
-
   const cloudwatchStream = {
     stream: createCWStream({
       logGroupName: `k2-${env}`,

packages/nylas-sync/app.js

@@ -1,4 +1,4 @@
-require('newrelic');
+// require('newrelic');
 global.Promise = require('bluebird');
 const {DatabaseConnector, Logger} = require(`nylas-core`)
 const SyncProcessManager = require('./sync-process-manager');

packages/nylas-sync/sync-process-manager.js

@@ -64,7 +64,9 @@ class SyncProcessManager {
     client.setAsync(key, Date.now()).then(() =>
       client.expireAsync(key, HEARTBEAT_EXPIRES)
     ).then(() =>
-      this._logger.info("ProcessManager: 💘")
+    this._logger.info({
+      accounts_syncing_count: Object.keys(this._workers).length,
+    }, "ProcessManager: 💘")
     )
   }