# HG changeset patch # User Timo Sirainen # Date 1488205389 -7200 # Node ID 2a8ac5c1c458452371ee3725ce7b07fc2f651e03 # Parent 91a26e7f6a9cbe5865f40f807865b5d67745db27 master: Try to listen on master socket even if all services couldn't be listened to. This could happen during a settings reload. diff -r 91a26e7f6a9c -r 2a8ac5c1c458 src/master/service-listen.c --- a/src/master/service-listen.c Mon Feb 27 16:22:52 2017 +0200 +++ b/src/master/service-listen.c Mon Feb 27 16:23:09 2017 +0200 @@ -367,8 +367,12 @@ if (ret2 < ret) ret = ret2; } - if (ret > 0) - ret = services_listen_master(service_list); + /* reloading config wants to continue even when we're returning 0. */ + if (ret >= 0) { + ret2 = services_listen_master(service_list); + if (ret2 < ret) + ret = ret2; + } #ifdef HAVE_SYSTEMD if (ret > 0)