From b67a3ae3e4415b14e64bcfb6e8729266371734f5 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 23 Jun 2016 18:17:04 -0700 Subject: [PATCH] Launch dashboard when in dev mode, publish change on acct creation --- Procfile.dev | 1 + packages/nylas-core/hook-account-crud.js | 1 + packages/nylas-core/scheduler-utils.js | 1 - packages/nylas-dashboard/app.js | 6 +++--- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Procfile.dev b/Procfile.dev index 62b30759f..7a652f5b0 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,3 +1,4 @@ redis: redis-server web: node packages/nylas-api/app.js worker: node packages/nylas-sync/app.js +dashboard: node packages/nylas-dashboard/app.js diff --git a/packages/nylas-core/hook-account-crud.js b/packages/nylas-core/hook-account-crud.js index 4264c10cc..4e4737b28 100644 --- a/packages/nylas-core/hook-account-crud.js +++ b/packages/nylas-core/hook-account-crud.js @@ -4,6 +4,7 @@ module.exports = (db, sequelize) => { sequelize.addHook("afterCreate", ({dataValues, $modelOptions}) => { if ($modelOptions.name.singular === 'Account') { PubsubConnector.broadcastClient().lpushAsync('accounts:unclaimed', dataValues.id); + PubsubConnector.notifyAccountChange(dataValues.id); } }) sequelize.addHook("afterUpdate", ({dataValues, $modelOptions}) => { diff --git a/packages/nylas-core/scheduler-utils.js b/packages/nylas-core/scheduler-utils.js index a98f902fa..94dc807cf 100644 --- a/packages/nylas-core/scheduler-utils.js +++ b/packages/nylas-core/scheduler-utils.js @@ -10,7 +10,6 @@ const HEARTBEAT_EXPIRES = 30; // 2 min in prod? const CLAIM_DURATION = 10 * 60 * 1000; // 2 hours on prod? const PubsubConnector = require('./pubsub-connector'); -const SyncPolicy = require('./sync-policy'); const forEachAccountList = (forEachCallback) => { const client = PubsubConnector.broadcastClient(); diff --git a/packages/nylas-dashboard/app.js b/packages/nylas-dashboard/app.js index cb0b6c909..213eec689 100644 --- a/packages/nylas-dashboard/app.js +++ b/packages/nylas-dashboard/app.js @@ -7,7 +7,7 @@ const {forEachAccountList} = SchedulerUtils; global.Promise = require('bluebird'); const server = new Hapi.Server(); -server.connection({ port: process.env.PORT || 5101 }); +server.connection({ port: process.env.PORT / 1 + 1 || 5101 }); DatabaseConnector.forShared().then(({Account}) => { server.register([HapiWebSocket, Inert], () => { @@ -62,14 +62,14 @@ DatabaseConnector.forShared().then(({Account}) => { path: '/{param*}', handler: { directory: { - path: 'public', + path: require('path').join(__dirname, 'public'), }, }, }); server.start((startErr) => { if (startErr) { throw startErr; } - console.log('Server running at:', server.info.uri); + console.log('Dashboard running at:', server.info.uri); }); }); });