jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge oauthproxy server into box server

Browse Source
This commit is contained in:
Girish Ramakrishnan
2015-09-14 11:57:33 -07:00
parent 9cad7773ff
commit fbae432b98
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
box.js
View File

@@ -8,7 +8,8 @@ var appHealthMonitor = require('./src/apphealthmonitor.js'),
async = require('async'),
config = require('./src/config.js'),
ldap = require('./src/ldap.js'),
server = require('./src/server.js');
oauthproxy = require('./src/oauthproxy.js'),
server = require('./src/server.js');
console.log();
console.log('==========================================');
@@ -28,7 +29,8 @@ console.log();
async.series([
server.start,
ldap.start,
appHealthMonitor.start
appHealthMonitor.start,
oauthproxy.start.bind(null, 4000 /* port */)
], function (error) {
if (error) {
console.error('Error starting server', error);
@@ -41,11 +43,13 @@ var NOOP_CALLBACK = function () { };
process.on('SIGINT', function () {
server.stop(NOOP_CALLBACK);
ldap.stop(NOOP_CALLBACK);
oauthproxy.stop(NOOP_CALLBACK);
setTimeout(process.exit.bind(process), 3000);
});
process.on('SIGTERM', function () {
server.stop(NOOP_CALLBACK);
ldap.stop(NOOP_CALLBACK);
oauthproxy.stop(NOOP_CALLBACK);
setTimeout(process.exit.bind(process), 3000);
});