From f8690bf1513bc97708dd63e0355669e3f431cf4c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 19 Mar 2022 11:38:21 +0000 Subject: mod_admin_socket: Improve error reporting when socket can't be created (fixes #1719) --- plugins/mod_admin_socket.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/mod_admin_socket.lua b/plugins/mod_admin_socket.lua index ffea9c61..c4e1d260 100644 --- a/plugins/mod_admin_socket.lua +++ b/plugins/mod_admin_socket.lua @@ -62,8 +62,16 @@ function module.load() sock = unix.stream(); sock:settimeout(0); os.remove(socket_path); - assert(sock:bind(socket_path)); - assert(sock:listen()); + local ok, err = sock:bind(socket_path); + if not ok then + module:log_status("error", "Unable to bind admin socket %s: %s", socket_path, err); + return; + end + local ok, err = sock:listen(); + if not ok then + module:log_status("error", "Unable to listen on admin socket %s: %s", socket_path, err); + return; + end if server.wrapserver then conn = server.wrapserver(sock, socket_path, 0, listeners); else -- cgit v1.2.3