From 3fc868652adf84ebfebc144dfd2b82bd995f1e09 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 15 Jan 2020 17:21:33 +0100 Subject: [PATCH] daemon/lua: warn instead of error on failed control socket binds --- daemon/lua/config.lua | 2 +- daemon/lua/distro-preconfig.lua.in | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/daemon/lua/config.lua b/daemon/lua/config.lua index 8088d7d39..52accee29 100644 --- a/daemon/lua/config.lua +++ b/daemon/lua/config.lua @@ -21,7 +21,7 @@ if not C.the_args.interactive and n_control_socks == 0 and not env.KRESD_NO_LIST local path = worker.cwd..'/control/'..worker.pid local ok, err = pcall(net.listen, path, nil, { kind = 'control' }) if not ok then - error('bind to '..path..' failed '..err) + warn('bind to '..path..' failed '..err) end end diff --git a/daemon/lua/distro-preconfig.lua.in b/daemon/lua/distro-preconfig.lua.in index 56375a86f..618e62d7c 100644 --- a/daemon/lua/distro-preconfig.lua.in +++ b/daemon/lua/distro-preconfig.lua.in @@ -1,15 +1,14 @@ local id = os.getenv('SYSTEMD_INSTANCE') - if not id then - error('environment variable $SYSTEMD_INSTANCE not set') + warn('environment variable $SYSTEMD_INSTANCE not set') else -- Bind to control socket in run_dir local path = '@run_dir@/control/'..id local ok, err = pcall(net.listen, path, nil, { kind = 'control' }) if not ok then - error('bind to '..path..' failed '..err) + warn('bind to '..path..' failed '..err) end - - -- Set cache location - rawset(cache, 'current_storage', 'lmdb://@systemd_cache_dir@') end + +-- Set cache location +rawset(cache, 'current_storage', 'lmdb://@systemd_cache_dir@') -- 2.47.3