chg: make connect debug message less repetitive
Before this patch, "connect to" debug message is printed repeatedly because
a previous patch changed how the chg client decides the server is ready to be
connected.
This patch revises the places we print connect debug messages so they are less
repetitive without losing useful information.
--- a/contrib/chg/chg.c Mon Apr 04 03:17:59 2016 +0100
+++ b/contrib/chg/chg.c Mon Apr 04 02:36:05 2016 +0100
@@ -236,6 +236,7 @@
static const struct timespec sleepreq = {0, 10 * 1000000};
int pst = 0;
+ debugmsg("try connect to %s repeatedly", opts->sockname);
for (unsigned int i = 0; i < 10 * 100; i++) {
hgclient_t *hgc = hgc_open(opts->sockname);
if (hgc)
@@ -271,6 +272,7 @@
{
const char *sockname = opts->redirectsockname[0] ?
opts->redirectsockname : opts->sockname;
+ debugmsg("try connect to %s", sockname);
hgclient_t *hgc = hgc_open(sockname);
if (hgc)
return hgc;
--- a/contrib/chg/hgclient.c Mon Apr 04 03:17:59 2016 +0100
+++ b/contrib/chg/hgclient.c Mon Apr 04 02:36:05 2016 +0100
@@ -429,7 +429,6 @@
strncpy(addr.sun_path, sockname, sizeof(addr.sun_path));
addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
- debugmsg("connect to %s", addr.sun_path);
int r = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
if (r < 0) {
close(fd);
@@ -438,6 +437,7 @@
abortmsg("cannot connect to %s (errno = %d)",
addr.sun_path, errno);
}
+ debugmsg("connected to %s", addr.sun_path);
hgclient_t *hgc = mallocx(sizeof(hgclient_t));
memset(hgc, 0, sizeof(*hgc));