diff --git a/package.json b/package.json index 3f204a147..dfe1a2972 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "The local sync engine for Nylas N1", "main": "", "dependencies": { - "lerna": "2.0.0-beta.23" + "lerna": "2.0.0-beta.23", + "pm2": "^1.1.3" }, "devDependencies": { "babel-eslint": "7.1.0", diff --git a/packages/local-sync/package.json b/packages/local-sync/package.json index 81494c0e5..22d59c782 100644 --- a/packages/local-sync/package.json +++ b/packages/local-sync/package.json @@ -8,35 +8,35 @@ "babel-preset-es2015": "6.9.0", "bunyan": "1.8.0", "bunyan-cloudwatch": "2.0.0", - "bunyan-loggly": "^1.0.0", - "bunyan-prettystream": "emorikawa/node-bunyan-prettystream", + "bunyan-loggly": "1.1.0", + "bunyan-prettystream": "github:emorikawa/node-bunyan-prettystream", "googleapis": "9.0.0", "hapi": "13.4.1", "hapi-auth-basic": "4.2.0", "hapi-boom-decorators": "1.1.3", "hapi-plugin-websocket": "0.9.2", "hapi-swagger": "6.1.0", - "imap": "0.8.x", + "imap": "0.8.18", "inert": "4.0.0", "jasmine": "2.4.1", "joi": "8.4.2", "lerna": "2.0.0-beta.23", "mailparser": "0.6.0", "mimelib": "0.2.19", - "mysql": "^2.11.1", + "mysql": "2.12.0", "newrelic": "1.34.0", "nodemailer": "2.5.0", "nylas-core": "0.x.x", - "pm2": "^1.1.3", - "promise-props": "^1.0.0", - "promise.prototype.finally": "^1.0.1", - "redis": "2.x.x", - "request": "^2.73.0", - "rx": "4.x.x", - "sequelize": "3.x.x", + "pm2": "1.1.3", + "promise-props": "1.0.0", + "promise.prototype.finally": "1.0.1", + "redis": "2.6.3", + "request": "2.79.0", + "rx": "4.1.0", + "sequelize": "3.27.0", "signalfx": "3.0.1", "sqlite3": "https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep-v3.1.4.tar.gz", - "underscore": "1.x.x", + "underscore": "1.8.3", "utf7": "https://github.com/truebit/utf7/archive/1f753bac59b99d93b17a5ef11681e232465e2558.tar.gz", "vision": "4.1.0", "xoauth2": "1.1.0" diff --git a/packages/nylas-core/log-streams.js b/packages/nylas-core/log-streams.js index 64682ab08..80c6cce5c 100644 --- a/packages/nylas-core/log-streams.js +++ b/packages/nylas-core/log-streams.js @@ -1,14 +1,7 @@ const os = require('os'); const createCWStream = require('bunyan-cloudwatch') const PrettyStream = require('bunyan-prettystream') -const Bunyan2Loggly = require('bunyan-loggly') -const {LOGGLY_TOKEN} = process.env -const logglyConfig = (name, env) => ({ - token: LOGGLY_TOKEN, - subdomain: 'nylas', - tags: [`${name}-${env}`], -}) const cloudwatchConfig = (name, env) => ({ logGroupName: `k2-${env}`, logStreamName: `${name}-${env}-${os.hostname()}`, @@ -30,7 +23,7 @@ const getLogStreams = (name, env) => { lessThan: 'error', }); const prettyStdErr = new PrettyStream({ - mode: 'pm2' + mode: 'pm2', }); prettyStdOut.pipe(process.stdout); prettyStdErr.pipe(process.stderr); @@ -52,11 +45,6 @@ const getLogStreams = (name, env) => { default: { return [ stdoutStream, - { - type: 'raw', - reemitErrorEvents: true, - stream: new Bunyan2Loggly(logglyConfig(name, env)), - }, { type: 'raw', reemitErrorEvents: true,