http: remember server config in http.servers table

diff --git a/modules/http/http.lua.in b/modules/http/http.lua.in
index a1e8486c668734b257f514fca95aa4ec6f786080..2ba4ff9bfd11c3020559370b8d994fe8b17f22c5 100644 (file)
--- a/modules/http/http.lua.in
+++ b/modules/http/http.lua.in
@@ -366,7 +366,7 @@ function M.add_interface(conf)
        if err then
                panic('failed to listen on %s: %s', addr_str, err)
        end
-       table.insert(M.servers, s)
+       table.insert(M.servers, {server = s, config = conf})
        -- Create certificate renewal timer if ephemeral
        if crt and ephemeral then
                local _, expiry = crt:getLifetime()
@@ -401,7 +401,7 @@ end
 -- @function Cleanup module
 function M.deinit()
        for i, server in ipairs(M.servers) do
-               server:close()
+               server.server:close()
                M.servers[i] = nil
        end
        prometheus.deinit()

diff --git a/modules/http/http.test.lua b/modules/http/http.test.lua
index 8d987597ea865586c88bd3952b7e734d404aa7da..b05f5a506cbbcd36335cf5ae23df1c64406791f3 100644 (file)
--- a/modules/http/http.test.lua
+++ b/modules/http/http.test.lua
@@ -14,12 +14,12 @@ else
        modules = {
                http = {
                        port = 0, -- Select random port
-                       cert = false,
+                       tls = false,
                        endpoints = endpoints,
                }
        }
 
-       local server = http.servers[1]
+       local server = http.servers[1].server
        ok(server ~= nil, 'creates server instance')
        local _, host, port = server:localname()
        ok(host and port, 'binds to an interface')