diff --git a/config/default.yml b/config/default.yml index 35d94058..0e738f15 100644 --- a/config/default.yml +++ b/config/default.yml @@ -1,4 +1,4 @@ -version: 0.0.200 +version: 0.0.310 interfaces: webserver: enabled: true @@ -63,7 +63,8 @@ store: dsn: mongodb://localhost:27017/cache expireafterseconds: 0 dispatch: - expires: 60 + enabled: true + expires: 60 authentication: basicauth: enabled: false diff --git a/lib/joola.io.js b/lib/joola.io.js index 831d4def..1ef8a7da 100644 --- a/lib/joola.io.js +++ b/lib/joola.io.js @@ -31,7 +31,6 @@ joola.init = function (options, callback) { //setup the stack joola.common = require('./common/index'); joola.options = joola.common.extend({ - localRoute: true, webserver: false, logger: { console: { diff --git a/lib/webserver/routes/index.js b/lib/webserver/routes/index.js index d40202c5..4b5fcbba 100644 --- a/lib/webserver/routes/index.js +++ b/lib/webserver/routes/index.js @@ -290,9 +290,10 @@ exports.router = function (req, res, next) { action.run.apply(this, args); }; + var useLocalRoute = !joola.config.get('dispatch:enabled'); if (action && action._route) return action._route(req, res); - else if (joola.options.localRoute) + else if (useLocalRoute) return localRoute(req, res); else return dispatchRoute(req, res);