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

try/catch fix, log output typo fix

This commit is contained in:
AJ ONeal 2015-02-15 23:43:07 +00:00
parent 233c6cd8ef
commit 5d0fecf0a9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vhost-sni-server.js
View File

@ -70,20 +70,22 @@ function getAppContext(domaininfo) {
try { try {
localApp = require(path.join(__dirname, 'vhosts', domaininfo.dirname, 'app.js')); localApp = require(path.join(__dirname, 'vhosts', domaininfo.dirname, 'app.js'));
if (localApp.create) {
// TODO read local config.yml and pass it in
// TODO pass in websocket
localApp = localApp.create(/*config*/);
}
if (!localApp.then) {
localApp = PromiseA.resolve(localApp);
}
} catch(e) { } catch(e) {
console.error("[ERROR] could not load app.js for " + domaininfo.dirname); console.error("[ERROR] could not load app.js for " + domaininfo.dirname);
console.error(e); console.error(e);
return PromiseA.resolve(connect().use('/', function (req, res) { localApp = connect().use(function (req, res) {
res.end('{ "error": { "message": "could not load app.js for ' + domaininfo.dirname + '" } }'); res.end('{ "error": { "message": "could not load app.js for ' + domaininfo.dirname + '" } }');
})); });
}
if (localApp.create) {
// TODO read local config.yml and pass it in
// TODO pass in websocket
localApp = localApp.create(/*config*/);
}
if (!localApp.then) {
localApp = PromiseA.resolve(localApp); localApp = PromiseA.resolve(localApp);
return localApp;
} }
return localApp; return localApp;
@ -147,7 +149,7 @@ forEachAsync(rootDomains, loadCerts).then(function () {
// Note: pathname should NEVER have a leading '/' on its own // Note: pathname should NEVER have a leading '/' on its own
// we always add it explicitly // we always add it explicitly
domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localApp); domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localApp);
console.info('Loaded ' + domaininfo.hostname + ':' + securePort + domaininfo.pathname); console.info('Loaded ' + domaininfo.hostname + ':' + securePort + '/' + domaininfo.pathname);
}); });
}).then(function () { }).then(function () {
domainMerged.forEach(function (domainApp) { domainMerged.forEach(function (domainApp) {