ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-20 21:33:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bz_subst

Browse Source
This commit is contained in:
Bryan Stansell 2021-07-17 10:36:11 -07:00 committed by GitHub
commit ebf3da2169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conserver/main.c
View File

@ -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

7
conserver/readcfg.c
View File

@ -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,