coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

generalization, updates

This commit is contained in:
AJ ONeal 2015-11-28 06:05:27 +00:00
parent aeb25d68fe
commit e00b670a3c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/master.js
View File

@ -53,7 +53,7 @@ cluster.on('online', function (worker) {
// TODO communicate config with environment vars? // TODO communicate config with environment vars?
info = { info = {
type: 'com.daplie.walnut.init' type: 'walnut.init'
, conf: { , conf: {
protocol: useCaddy ? 'http' : 'https' protocol: useCaddy ? 'http' : 'https'
, externalPort: conf.externalPort , externalPort: conf.externalPort
@ -70,7 +70,7 @@ cluster.on('online', function (worker) {
worker.send(info); worker.send(info);
function touchMaster(msg) { function touchMaster(msg) {
if ('com.daplie.walnut.webserver.listening' !== msg.type) { if ('walnut.webserver.listening' !== msg.type) {
console.warn('[MASTER] received unexpected message from worker'); console.warn('[MASTER] received unexpected message from worker');
console.warn(msg); console.warn(msg);
return; return;
@ -80,7 +80,7 @@ cluster.on('online', function (worker) {
state.caddy = caddy; state.caddy = caddy;
state.workers = workers; state.workers = workers;
require('../lib/master').touch(conf, state).then(function () { require('../lib/master').touch(conf, state).then(function () {
info.type = 'com.daplie.walnut.webserver.onrequest'; info.type = 'walnut.webserver.onrequest';
info.conf.ipcKey = conf.ipcKey; info.conf.ipcKey = conf.ipcKey;
info.conf.memstoreSock = conf.memstoreSock; info.conf.memstoreSock = conf.memstoreSock;
info.conf.sqlite3Sock = conf.sqlite3Sock; info.conf.sqlite3Sock = conf.sqlite3Sock;

4
lib/schemes-config.js
View File

@ -134,13 +134,13 @@ module.exports.create = function (db) {
// Collections // Collections
// //
{ tablename: 'apis' { tablename: 'apis'
, idname: 'id' // io.lds.auth, com.daplie.radio , idname: 'id' // com.example
, unique: ['id'] , unique: ['id']
// name // LDS Account, Radio // name // LDS Account, Radio
, indices: ['createdAt', 'updatedAt', 'deletedAt', 'revokedAt', 'name'] , indices: ['createdAt', 'updatedAt', 'deletedAt', 'revokedAt', 'name']
} }
, { tablename: 'apps' , { tablename: 'apps'
, idname: 'id' // io.lds.auth, com.daplie.radio , idname: 'id' // com.example
, unique: ['id'] , unique: ['id']
, indices: ['createdAt', 'updatedAt', 'deletedAt', 'revokedAt', 'name'] , indices: ['createdAt', 'updatedAt', 'deletedAt', 'revokedAt', 'name']
} }