public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Before renaming imports to tasks

Browse source
This commit is contained in:
Tomas Bures 2018-09-23 22:28:58 +02:00
parent a494dc6482
commit 86efa11994
18 changed files with 81 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

11
index.js
View file

@ -18,6 +18,7 @@ const executor = require('./lib/executor');
const privilegeHelpers = require('./lib/privilege-helpers');
const knex = require('./lib/knex');
const shares = require('./models/shares');
const { AppType } = require('./shared/app');
const trustedPort = config.www.trustedPort;
const sandboxPort = config.www.sandboxPort;
@ -31,7 +32,7 @@ if (config.title) {
log.level = config.log.level;
function startHTTPServer(appType, port, callback) {
function startHTTPServer(appType, appName, port, callback) {
const app = appBuilder.createApp(appType);
app.set('port', port);
@ -60,7 +61,7 @@ function startHTTPServer(appType, port, callback) {
server.on('listening', () => {
const addr = server.address();
const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port;
log.info('Express', 'WWW server listening on %s', bind);
log.info('Express', 'WWW server [%s] listening on %s', appName, bind);
});
server.listen({port, host}, callback);
@ -85,9 +86,9 @@ dbcheck(err => { // Check if database needs upgrading before starting the server
executor.spawn(() => {
testServer(() => {
verpServer(() => {
startHTTPServer(AppType.TRUSTED, trustedPort, () => {
startHTTPServer(AppType.SANDBOXED, sandboxPort, () => {
startHTTPServer(AppType.PUBLIC, publicPort, () => {
startHTTPServer(AppType.TRUSTED, 'trusted', trustedPort, () => {
startHTTPServer(AppType.SANDBOXED, 'sandbox', sandboxPort, () => {
startHTTPServer(AppType.PUBLIC, 'public', publicPort, () => {
privilegeHelpers.dropRootPrivileges();
tzupdate.start();