Skip to content

Commit

Permalink
master: Try to listen on master socket even if all services couldn't …
Browse files Browse the repository at this point in the history
…be listened to.

This could happen during a settings reload.
  • Loading branch information
sirainen authored and GitLab committed Mar 1, 2017
1 parent 9b7a4aa commit b39dd48
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/master/service-listen.c
Expand Up @@ -367,8 +367,12 @@ int services_listen(struct service_list *service_list)
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)
Expand Down

0 comments on commit b39dd48

Please sign in to comment.