Increase statserv GFS string buffers to 1024

[yaz-moved-to-github.git] / src / statserv.c

diff --git a/src/statserv.c b/src/statserv.c
index a1b5c98..4345fbe 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 
@@ -96,7 +96,6 @@ statserv_options_block control_block = {
     0,                          /* one shot (single session) */
     "",                         /* no PDUs */
     "",                         /* diagnostic output to stderr */
-    "tcp:@:9999",               /* default listener port */
     PROTO_Z3950,                /* default application protocol */
     900,                        /* idle timeout (seconds) */
     64*1024*1024,               /* maximum PDU size (approx.) to allow */
@@ -1026,7 +1025,7 @@ static void *new_session(void *vp)
     a = 0;
 #endif
     yaz_log_xml_errors(0, YLOG_WARN);
-    yaz_log(log_session, "Session - OK %d %s %ld",
+    yaz_log(log_session, "Session - OK %d %s PID=%ld",
             no_sessions, a ? a : "[Unknown]", (long) getpid());
     if (max_sessions && no_sessions >= max_sessions)
         control_block.one_shot = 1;
@@ -1102,8 +1101,8 @@ static int add_listener(char *where, int listen_id)
     else
         mode = "static";
 
-    yaz_log(log_server, "Adding %s listener on %s id=%d", mode, where,
-            listen_id);
+    yaz_log(log_server, "Adding %s listener on %s id=%d PID=%ld", mode, where,
+            listen_id, (long) getpid());
 
     l = cs_create_host(where, 2, &ap);
     if (!l)
@@ -1205,6 +1204,14 @@ static void daemon_handler(void *data)
     iochan_event_loop(pListener);
 }
 
+#ifndef WIN32
+static void normal_stop_handler(int num)
+{
+    yaz_log(log_server, "Received SIGTERM. PID=%ld", (long) getpid());
+    exit(0);
+}
+#endif
+
 static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
 {
     char sep;
@@ -1245,8 +1252,8 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
     {
         xml_config_add_listeners();
 
-        if (!pListener && *control_block.default_listen)
-            add_listener(control_block.default_listen, 0);
+        if (!pListener)
+            add_listener("tcp:@:9999", 0);
 
 #ifndef WIN32
         if (control_block.dynamic)
@@ -1257,8 +1264,10 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
         return 1;
     if (s)
         yaz_sc_running(s);
-    yaz_log(YLOG_DEBUG, "Entering event loop.");
 
+#ifndef WIN32
+    signal(SIGTERM, normal_stop_handler);
+#endif
     yaz_daemon(programname,
                (control_block.background ? YAZ_DAEMON_FORK : 0),
                daemon_handler, &pListener,
@@ -1269,8 +1278,8 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
 
 static void option_copy(char *dst, const char *src)
 {
-    strncpy(dst, src ? src : "", 127);
-    dst[127] = '\0';
+    strncpy(dst, src ? src : "", BEND_NAME_MAX-1);
+    dst[BEND_NAME_MAX-1] = '\0';
 }
 
 int check_options(int argc, char **argv)