X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=f5fb325b934992f71615c276fd66a79ebfac33b9;hp=a616cc9e9653c81930accad5aca9f40f793da5c9;hb=bcd497eb945e135d9693ca7f1c0285930a0622fa;hpb=afff2d64ae8758642c8e88bfebff9c00a982daa4

diff --git a/server/statserv.c b/server/statserv.c
index a616cc9..f5fb325 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.9  1995-03-27 08:34:30  quinn
+ * 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
+ * Fixed bug.
+ *
+ * Revision 1.10  1995/03/29  15:40:16  quinn
+ * Ongoing work. Statserv is now dynamic by default
+ *
+ * Revision 1.9  1995/03/27  08:34:30  quinn
  * Added dynamic server functionality.
  * Released bindings to session.c (is now redundant)
  *
@@ -53,11 +65,14 @@
 #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 int dynamic = 0;   /* fork on incoming connection */
+static int dynamic = 1;   /* fork on incoming connection */
 
 #define DEFAULT_LISTENER "tcp:localhost:9999"
 
@@ -189,7 +204,8 @@ static void add_listener(char *where, int what)
     void *ap;
     IOCHAN lst;
 
-    fprintf(stderr, "Adding %s listener on %s\n",
+    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)
     {
@@ -206,6 +222,7 @@ static void add_listener(char *where, int what)
 	}
 	type = tcpip_type;
     }
+#ifdef USE_XTIMOSI
     else if (!strcmp(mode, "osi"))
     {
     	if (!(ap = mosi_strtoaddr(addr)))
@@ -215,6 +232,7 @@ static void add_listener(char *where, int what)
 	}
 	type = mosi_type;
     }
+#endif
     else
     {
     	fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
@@ -250,10 +268,12 @@ int statserv_main(int argc, char **argv)
 {
     int ret, listeners = 0;
     char *arg;
-    int protocol = CS_Z3950;;
+    int protocol = CS_Z3950;
+    char *logfile = 0;
+    int loglevel = LOG_DEFAULT_LEVEL;
 
     me = argv[0];
-    while ((ret = options("szdl:", argv, argc, &arg)) != -2)
+    while ((ret = options("szSl:v:", argv, argc, &arg)) != -2)
     	switch (ret)
     	{
 	    case 0:
@@ -262,9 +282,17 @@ int statserv_main(int argc, char **argv)
 		break;
 	    case 'z': protocol = CS_Z3950; break;
 	    case 's': protocol = CS_SR; break;
-	    case 'd': dynamic = 1; break;
+	    case 'S': dynamic = 0; break;
+	    case 'l':
+	   	 logfile = arg;
+		 log_init(loglevel, me, logfile);
+		 break;
+	    case 'v':
+	   	 loglevel = log_mask_str(arg);
+	   	 log_init(loglevel, me, logfile);
+		 break;
 	    default:
-	    	fprintf(stderr, "Usage: %s [ -zsd <listener-addr> ... ]\n", me);
+	    	fprintf(stderr, "Usage: %s [ -v <loglevel> -l <logfile> -zsS <listener-addr> ... ]\n", me);
 	    	exit(1);
 	}
     if (dynamic)