From 6e7a79a8b996981b97774093203869c93d25220a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Tue, 21 Jul 2020 14:11:53 +0200 Subject: [PATCH] daemon: always listen on control socket, even in interactive mode Reasons: - It allows to run several kresd instances and use map() without worrying about instance parameters. - It removes special case from map(). Proper functionality depends on changes in MR !1011. --- daemon/lua/postconfig.lua | 2 +- daemon/lua/sandbox.lua.in | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/lua/postconfig.lua b/daemon/lua/postconfig.lua index 48ac65aa4..49213cc0c 100644 --- a/daemon/lua/postconfig.lua +++ b/daemon/lua/postconfig.lua @@ -25,7 +25,7 @@ local n_dns_socks, n_control_socks = count_sockets() worker.control_path = worker.control_path or (worker.cwd .. '/control/') -- Bind to control socket by default -if not C.the_args.interactive and n_control_socks == 0 and not env.KRESD_NO_LISTEN then +if n_control_socks == 0 and not env.KRESD_NO_LISTEN then local path = worker.control_path..worker.pid local ok, err = pcall(net.listen, path, nil, { kind = 'control' }) if not ok then diff --git a/daemon/lua/sandbox.lua.in b/daemon/lua/sandbox.lua.in index 1fa31906e..63d94c3c0 100644 --- a/daemon/lua/sandbox.lua.in +++ b/daemon/lua/sandbox.lua.in @@ -667,13 +667,8 @@ function map(cmd, format) local filetab = kluautil.list_dir(worker.control_path) if next(filetab) == nil then - local ret = eval_cmd(cmd, format == 'luaobj') - if ret == nil then - results = {} - else - table.insert(results, ret) - end - return results + panic('no control sockets found in directory %s', + worker.control_path) end for _,file in ipairs(filetab) do -- 2.47.2