X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=b97eb39e2b28bbaf907ad81d3f0e421c23700ff9;hb=87a9bdcb0fda85461f9992519f4239645c8b2826;hp=5adb116e921eb9eb8758a43d23cf091d90777b88;hpb=3cb5bc246b8640b6aca6339080315591881a24e1;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index 5adb116..b97eb39 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.12  1995-03-30 13:29:02  quinn
+ * Revision 1.15  1995-03-31 10:16:51  quinn
+ * Fixed logging.
+ *
+ * Revision 1.14  1995/03/31  09:18:58  quinn
+ * Added logging.
+ *
+ * Revision 1.13  1995/03/30  16:08:39  quinn
+ * Little mods.
+ *
+ * Revision 1.12  1995/03/30  13:29:02  quinn
  * Smallish
  *
  * Revision 1.11  1995/03/30  12:18:17  quinn
@@ -62,12 +71,15 @@
 #include <eventl.h>
 #include <comstack.h>
 #include <tcpip.h>
+#ifdef USE_XTIMOSI
 #include <xmosi.h>
+#endif
 #include <dmalloc.h>
 #include <log.h>
 
-static char *me = "";
+static char *me = "statserver";
 static int dynamic = 1;   /* fork on incoming connection */
+static int loglevel = LOG_DEFAULT_LEVEL;
 
 #define DEFAULT_LISTENER "tcp:localhost:9999"
 
@@ -93,18 +105,22 @@ static void listener(IOCHAN h, int event)
 
 	    if (pipe(hand) < 0)
 	    {
-		perror("pipe");
+		logf(LOG_FATAL|LOG_ERRNO, "pipe");
 		exit(1);
 	    }
 	    if ((res = fork()) < 0)
 	    {
-		perror("fork");
+		logf(LOG_FATAL|LOG_ERRNO, "fork");
 		exit(1);
 	    }
 	    else if (res == 0) /* child */
 	    {
+	    	char nbuf[100];
+
 		close(hand[0]);
 		child = 1;
+		sprintf(nbuf, "%s(%d)", me, getpid());
+		log_init(loglevel, nbuf, 0);
 	    }
 	    else /* parent */
 	    {
@@ -117,24 +133,25 @@ static void listener(IOCHAN h, int event)
 		    
 		    if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR)
 		    {
-			perror("handshake read");
+			logf(LOG_FATAL|LOG_ERRNO, "handshake read");
 			exit(1);
 		    }
 		    else if (res >= 0)
 		    	break;
 		}
-		fprintf(stderr, "P: Child has taken the call\n");
+		logf(LOG_DEBUG, "P: Child has taken the call");
 		close(hand[0]);
 		return;
 	    }
 	}
 	if ((res = cs_listen(line, 0, 0)) < 0)
 	{
-	    fprintf(stderr, "cs_listen failed.\n");
+	    logf(LOG_FATAL, "cs_listen failed.");
 	    return;
 	}
 	else if (res == 1)
 	    return;
+	logf(LOG_DEBUG, "listen ok");
 	iochan_setevent(h, EVENT_OUTPUT);
 	iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */
     }
@@ -146,10 +163,11 @@ static void listener(IOCHAN h, int event)
 
 	if (!(new_line = cs_accept(line)))
 	{
-	    fprintf(stderr, "Accept failed.\n");
+	    logf(LOG_FATAL, "Accept failed.");
 	    iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
 	    return;
 	}
+	logf(LOG_DEBUG, "accept ok");
 	if (dynamic)
 	{
 	    IOCHAN pp;
@@ -161,9 +179,8 @@ static void listener(IOCHAN h, int event)
 		iochan_destroy(pp);
 	    }
 	    /* release dad */
-	    fprintf(stderr, "Releasing parent\n");
+	    logf(LOG_DEBUG, "Releasing parent");
 	    close(hand[1]);
-	    fprintf(stderr, "New fd is %d\n", cs_fileno(new_line));
 	}
 	else
 	    iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
@@ -171,19 +188,20 @@ static void listener(IOCHAN h, int event)
 	if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session,
 	    EVENT_INPUT)))
 	{
-	    fprintf(stderr, "Failed to create iochan\n");
+	    logf(LOG_FATAL, "Failed to create iochan");
 	    exit(1);
 	}
 	if (!(newas = create_association(new_chan, new_line)))
 	{
-	    fprintf(stderr, "Failed to create new assoc.\n");
+	    logf(LOG_FATAL, "Failed to create new assoc.");
 	    exit(1);
 	}
 	iochan_setdata(new_chan, newas);
+	logf(LOG_LOG, "accepted connection");
     }
     else
     {
-    	fprintf(stderr, "Bad event on listener.\n");
+    	logf(LOG_FATAL, "Bad event on listener.");
     	exit(1);
     }
 }
@@ -199,9 +217,6 @@ static void add_listener(char *where, int what)
     void *ap;
     IOCHAN lst;
 
-    fprintf(stderr, "Adding %s %s listener on %s\n",
-        dynamic ? "dynamic" : "static",
-    	what == PROTO_SR ? "SR" : "Z3950", where);
     if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
     {
     	fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'<address>.\n",
@@ -233,21 +248,23 @@ static void add_listener(char *where, int what)
     	fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
     	exit(1);
     }
+    logf(LOG_LOG, "Adding %s %s listener on %s",
+        dynamic ? "dynamic" : "static",
+    	what == PROTO_SR ? "SR" : "Z3950", where);
     if (!(l = cs_create(type, 0, what)))
     {
-    	fprintf(stderr, "Failed to create listener\n");
+    	logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener");
     	exit(1);
     }
     if (cs_bind(l, ap, CS_SERVER) < 0)
     {
-    	fprintf(stderr, "Failed to bind.\n");
-    	perror(where);
+    	logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where);
     	exit(1);
     }
     if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT |
    	 EVENT_EXCEPT)))
     {
-    	fprintf(stderr, "Failed to create IOCHAN-type\n");
+    	logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type");
     	exit(1);
     }
     iochan_setdata(lst, l);
@@ -265,7 +282,6 @@ int statserv_main(int argc, char **argv)
     char *arg;
     int protocol = CS_Z3950;
     char *logfile = 0;
-    int loglevel = LOG_DEFAULT_LEVEL;
 
     me = argv[0];
     while ((ret = options("szSl:v:", argv, argc, &arg)) != -2)
@@ -294,5 +310,6 @@ int statserv_main(int argc, char **argv)
     	signal(SIGCHLD, catchchld);
     if (!listeners)
 	add_listener(DEFAULT_LISTENER, protocol);
+    logf(LOG_LOG, "Entering event loop.");
     return event_loop();
 }