mirror of
https://github.com/bstansell/conserver.git
synced 2024-12-18 20:37:56 +00:00
Merge branch 'master' into bz_subst
This commit is contained in:
commit
ebf3da2169
@ -1770,7 +1770,7 @@ main(int argc, char **argv)
|
||||
remote++;
|
||||
setproctitle("master: port %hu, %d local, %d remote",
|
||||
# if USE_IPV6
|
||||
config->primaryport,
|
||||
(unsigned short)strtol(config->primaryport, NULL, 10),
|
||||
# elif USE_UNIX_DOMAIN_SOCKETS
|
||||
(unsigned short)0,
|
||||
# else
|
||||
|
@ -5382,7 +5382,12 @@ ReReadCfg(int fd, int msfd)
|
||||
local += pGE->imembers;
|
||||
for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
|
||||
remote++;
|
||||
setproctitle("master: port %hu, %d local, %d remote", bindPort,
|
||||
setproctitle("master: port %hu, %d local, %d remote",
|
||||
# if !USE_UNIX_DOMAIN_SOCKETS
|
||||
(unsigned short)strtol(config->primaryport, NULL, 10),
|
||||
# else
|
||||
(unsigned short)0,
|
||||
# endif
|
||||
local, remote);
|
||||
} else
|
||||
setproctitle("group %u: port %hu, %d %s", pGroups->id,
|
||||
|
Loading…
Reference in New Issue
Block a user