THREADS: config setting min_workers _now_ also is that, plus its also max_spare_workers

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index dee82748d13053bf27d62217b1fce1fc56a91649..a4c58d04883c7ba706a923648ee7fe39b50d1af5 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -579,6 +579,7 @@ void CtdlDestroyEVCleanupHooks(void)
        {
                MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
                p = cur->next;
+               cur->h_function_pointer();
                free(cur);
                cur = p;
        }
@@ -1225,18 +1226,29 @@ void CtdlShutdownServiceHooks(void)
 
 void CtdlDestroyServiceHook(void)
 {
+       const char *Text;
        ServiceFunctionHook *cur, *p;
 
        cur = ServiceHookTable;
        while (cur != NULL)
        {
-               close(cur->msock);
+               if (cur->msock != -1)
+               {
+                       close(cur->msock);
+                       Text = "Closed";
+               }
+               else
+               {
+                       Text = " Not closing again";
+               }
+
                if (cur->sockpath) {
-                       MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+                       MOD_syslog(LOG_INFO, "%s UNIX domain socket %s\n",
+                                  Text,
                                   cur->sockpath);
                        unlink(cur->sockpath);
                } else if (cur->tcp_port) {
-                       MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
+                       MOD_syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port);
                } else {
                        MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
                }