# HG changeset patch # User jbe # Date 1420846565 -3600 # Node ID 9d3d11cf1bf6ec1fb5a12a40ad6d0248824a6f41 # Parent 474cf0cfb85b710da7a0cbe364c6c88156d687b0 Changes in mcp.lua regarding configuration management (only single application allowed) diff -r 474cf0cfb85b -r 9d3d11cf1bf6 framework/bin/mcp.lua --- a/framework/bin/mcp.lua Sat Jan 10 00:28:03 2015 +0100 +++ b/framework/bin/mcp.lua Sat Jan 10 00:36:05 2015 +0100 @@ -178,7 +178,12 @@ end }) --- execute configurations +-- replace Moonbridge listen function and execute configurations +local moonbridge_listen = listen +local listeners +function _G.listen(args) + listeners[#listeners+1] = args +end for i, config_name in ipairs(WEBMCP_CONFIG_NAMES) do execute.config(config_name) end @@ -191,27 +196,17 @@ -- invoke moonbridge if WEBMCP_MODE == "listen" then local http = require("moonbridge_http") - local moonbridge_listen = listen - local listeners - function _G.listen(args) - listeners[#listeners+1] = args - end - for i = 1, #extraargs/2 do - local config = {} - listeners = {} - execute.config(config_name) - for i, listener in ipairs(listeners) do - listener.prepare = execute.prefork_initializers - listener.connect = http.generate_handler( - request.get_http_options(), - function(http_request) - execute.postfork_initializers() - request.handler(http_request) - end - ) - listener.finish = execute.finalizers - moonbridge_listen(listener) - end + for i, listener in ipairs(listeners) do + listener.prepare = execute.prefork_initializers + listener.connect = http.generate_handler( + request.get_http_options(), + function(http_request) + execute.postfork_initializers() + request.handler(http_request) + end + ) + listener.finish = execute.finalizers + moonbridge_listen(listener) end end