From 73e807a6b6d726d2bfe85dac98c3612de5db1249 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Thu, 7 Aug 2014 21:02:15 +1000 Subject: [PATCH] Don't extract sockaddr when we have an old fd --- src/ckpool.c | 6 +++--- src/connector.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ckpool.c b/src/ckpool.c index fa96d6f1..6f9aef2d 100644 --- a/src/ckpool.c +++ b/src/ckpool.c @@ -835,7 +835,7 @@ static void __shutdown_children(ckpool_t *ckp, int sig) int i; pthread_cancel(ckp->pth_watchdog); - join_pthread(ckp->pth_watchdog); + //join_pthread(ckp->pth_watchdog); for (i = 0; i < ckp->proc_instances; i++) { pid_t pid = ckp->children[i]->pid; @@ -847,7 +847,7 @@ static void __shutdown_children(ckpool_t *ckp, int sig) static void shutdown_children(ckpool_t *ckp, int sig) { pthread_cancel(ckp->pth_watchdog); - join_pthread(ckp->pth_watchdog); + //join_pthread(ckp->pth_watchdog); __shutdown_children(ckp, sig); } @@ -859,7 +859,7 @@ static void sighandler(int sig) LOGWARNING("Parent process %s received signal %d, shutting down", ckp->name, sig); pthread_cancel(ckp->pth_watchdog); - join_pthread(ckp->pth_watchdog); + //join_pthread(ckp->pth_watchdog); __shutdown_children(ckp, SIGTERM); /* Wait a second, then send SIGKILL */ diff --git a/src/connector.c b/src/connector.c index 38375212..33ce7f90 100644 --- a/src/connector.c +++ b/src/connector.c @@ -576,7 +576,6 @@ int connector(proc_instance_t *pi) LOGWARNING("%s connector starting", ckp->name); if (ckp->oldconnfd > 0) { - extract_sockaddr(ckp->serverurl, &url, &port); sockd = ckp->oldconnfd; } else if (ckp->serverurl) { if (!extract_sockaddr(ckp->serverurl, &url, &port)) {