X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=c4a7e9d529aeef7e414c1f18e91d0a5cfcde9082;hb=e13889f2448f526c2d7be104228a76278fdd1e18;hp=c69444301038700e25a0fedd2ada1f7a5fd31d7a;hpb=e26ffdbc4b024a06b4ca46c6aecb5c3dd09b7e8d;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index c694443..c4a7e9d 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.87 2002-11-26 16:04:15 adam Exp $
+ * $Id: statserv.c,v 1.90 2003-01-14 08:21:14 adam Exp $
  */
 
 #include <stdio.h>
@@ -354,7 +354,6 @@ void statserv_closedown()
 {
     IOCHAN p;
 
-/* CHANGE */
     if (control_block.bend_stop)
         (*control_block.bend_stop)(&control_block);
     for (p = pListener; p; p = p->next)
@@ -416,6 +415,10 @@ static void listener(IOCHAN h, int event)
 		}
 		sprintf(nbuf, "%s(%d)", me, getpid());
 		yaz_log_init(control_block.loglevel, nbuf, 0);
+                /* ensure that bend_stop is not called when each child exits -
+                   only for the main process .. 
+                */
+                control_block.bend_stop = 0;
 	    }
 	    else /* parent */
 	    {
@@ -712,14 +715,14 @@ int statserv_start(int argc, char **argv)
     if (control_block.bend_start)
         (*control_block.bend_start)(&control_block);
 #ifdef WIN32
-    logf (LOG_LOG, "Starting server %s", me);
+    yaz_log (LOG_LOG, "Starting server %s", me);
 #else
 /* UNIX */
     if (control_block.inetd)
 	inetd_connection(control_block.default_proto);
     else
     {
-	logf (LOG_LOG, "Starting server %s pid=%d", me, getpid());
+	yaz_log (LOG_LOG, "Starting server %s pid=%d", me, getpid());
 #if 0
 	sigset_t sigs_to_block;