X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fstatserv.c;h=7f23e16dfc6a7e2dcc5ac23589f552b002f05603;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=42acb60816b33e9756d075d159e4dd6c23d94984;hpb=efee4fe9b116348fcc0eb94a529650f8770143fb;p=yaz-moved-to-github.git

diff --git a/src/statserv.c b/src/statserv.c
index 42acb60..7f23e16 100644
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.44 2006-09-29 13:20:23 adam Exp $
+ * $Id: statserv.c,v 1.47 2007-01-19 10:29:13 adam Exp $
  */
 
 /**
@@ -85,8 +85,7 @@ static statserv_options_block *current_control_block = 0;
 /*
  * default behavior.
  */
-#define STAT_DEFAULT_LOG_LEVEL "none,fatal,warn,log,server,session,request"
-/* the 'none' clears yaz' own default settings, including [log] */
+#define STAT_DEFAULT_LOG_LEVEL "server,session,request"
 
 int check_options(int argc, char **argv);
 statserv_options_block control_block = {
@@ -1112,7 +1111,11 @@ static int add_listener(char *where, int listen_id)
 
     if (cs_bind(l, ap, CS_SERVER) < 0)
     {
-        yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+        if (cs_errno(l) == CSYSERR)
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+        else
+            yaz_log(YLOG_FATAL, "Failed to bind to %s: %s", where,
+                    cs_strerror(l));
         cs_close (l);
         return -1;
     }
@@ -1337,18 +1340,9 @@ int check_options(int argc, char **argv)
     int ret = 0, r;
     char *arg;
 
-    if (getenv("YAZ_LOG") == 0) {
-        /*
-         * Set default log level.  We want to avoid doing this if the
-         * user has already explicitly specified a preferred default
-         * log-level, hence the inelegant peek at the YAZ_LOG
-         * environment variable that will subsequently be interpreted
-         * by the YAZ logging module itself.
-         */
-        yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL));
-    }
-
+    yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL)); 
     get_logbits(1); 
+
     while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:r:",
                           argv, argc, &arg)) != -2)
     {
@@ -1395,12 +1389,10 @@ int check_options(int argc, char **argv)
             }
             yaz_log_time_format(arg);
             break;
-        case 'v': {
-            int default_level = yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL);
-            yaz_log_init_level(yaz_log_mask_str_x(arg, default_level));
+        case 'v':
+            yaz_log_init_level(yaz_log_mask_str(arg));
             get_logbits(1); 
             break;
-        }
         case 'a':
             option_copy(control_block.apdufile, arg);
             break;