X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=21796f6c2f2e8c45dc4002e819fc3b2815fb63c9;hb=eca406342a6af973b7b8687e739b3ebc2d8a18c5;hp=06df98e6d1ab2c238f17777b82eafbb99e298f61;hpb=277e55dae549f6fa6b9ad22d8ebd89af53bcd71b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 06df98e..21796f6 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.27 2004-01-05 11:31:04 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.29 2004-01-07 13:40:06 adam Exp $
  */
 
 #include <signal.h>
@@ -109,7 +109,6 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     }
     if (addr)
     {
-	yaz_log(LOG_LOG, "0 Starting proxy " VERSION );
 	if (proxy->server(addr))
 	{
 	    yaz_log(LOG_FATAL|LOG_ERRNO, "listen %s", addr);
@@ -133,9 +132,11 @@ static void sighup_handler(int num)
 }
 
 
-static void child_run(Yaz_SocketManager *m)
+static void child_run(Yaz_SocketManager *m, int run)
 {
-    yaz_log(LOG_LOG, "0 proxy pid=%ld", (long) getpid());
+    signal(SIGHUP, sighup_handler);
+
+    yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
     if (pid_fname)
     {
 	FILE *f = fopen(pid_fname, "w");
@@ -180,19 +181,18 @@ static void child_run(Yaz_SocketManager *m)
 int main(int argc, char **argv)
 {
     int cont = 1;
-    static int mk_pid = 0;
+    int run = 1;
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
     static_yaz_proxy = &proxy;
 
-    signal(SIGHUP, sighup_handler);
 
     args(&proxy, argc, argv);
 
     if (debug)
     {
-	child_run(&mySocketManager);
+	child_run(&mySocketManager, run);
 	exit(0);
     }
     while (cont)
@@ -205,11 +205,14 @@ int main(int argc, char **argv)
 	}
 	else if (p == 0)
 	{
-	    child_run(&mySocketManager);
+	    child_run(&mySocketManager, run);
 	}
 	pid_t p1;
 	int status;
 	p1 = wait(&status);
+
+	yaz_log_reopen();
+
 	if (p1 != p)
 	{
 	    yaz_log(LOG_FATAL, "p1=%d != p=%d", p1, p);
@@ -232,7 +235,7 @@ int main(int argc, char **argv)
 		break;
 	    case SIGTERM:
 		yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
-			WTERMSIG(status), (long) p);
+			(long) p);
 		cont = 0;
 		break;
 	    default:
@@ -250,6 +253,7 @@ int main(int argc, char **argv)
 	}
 	if (cont)
 	    sleep(1);
+	run++;
     }
     exit (0);
     return 0;