X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=ecdb45819a78c20bfad66b6141adfaa95970d1a0;hb=a94620ffd6001681474a94f5de767f168d772d1c;hp=4ee727cb27086a56550d0cd92dabfe5a884d06e7;hpb=3dc194a876fec3eeb9623f7a14cabf7eb0b4a2dc;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index 4ee727c..ecdb458 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.11 2004-11-03 22:33:17 adam Exp $
+ * $Id: log.c,v 1.15 2004-11-17 13:03:07 heikki Exp $
  */
 
 /**
@@ -35,7 +35,6 @@
 #include <time.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
-#include <yaz/nmem.h>
 
 static NMEM_MUTEX log_mutex = 0;
 static int mutex_init_flag = 0; /* not yet initialized */
@@ -89,6 +88,7 @@ static struct {
     { LOG_APP3,   "app3" },
     { LOG_ALL,    "all"  },
     { LOG_FLUSH,  "flush" },
+    { LOG_LOGLVL, "loglevel" }, 
     { 0,          "none" },
     { 0, NULL }
     /* the rest will be filled in if the user defines dynamic modules*/
@@ -156,6 +156,7 @@ static void rotate_log()
     newname[509] = '\0'; /* make sure it is terminated */
     strcat(newname,".1");
 #ifdef WIN32
+    /* windows can't rename a file if it is open */
     fclose(l_file);
     l_file = stderr;
 #endif
@@ -172,6 +173,22 @@ void yaz_log_init_level (int level)
         yaz_log_reopen(); /* make sure we set buffering right */
     } else
         l_level = level;
+    if (l_level  & LOG_LOGLVL)
+    {  /* dump the log level bits */
+        char *bittype="Static ";
+        int i;
+        yaz_log(LOG_LOGLVL,"Setting log level to %d = 0x%08x",l_level,l_level);
+        for (i = 0; mask_names[i].name; i++)
+            if (mask_names[i].mask && *mask_names[i].name)
+                if (strcmp(mask_names[i].name,"all")!=0)
+                {
+                    yaz_log(LOG_LOGLVL,"%s log bit %08x '%s' is %s",
+                        bittype, mask_names[i].mask, mask_names[i].name,
+                        (level & mask_names[i].mask)?  "ON": "off");
+                if (mask_names[i].mask>LOG_LAST_BIT)
+                    bittype="Dynamic";
+                }
+    }
 }
 
 void yaz_log_init_prefix (const char *prefix)
@@ -258,8 +275,10 @@ void yaz_log(int level, const char *fmt, ...)
     	{
 	    if (*mask_names[i].name && mask_names[i].mask && 
                  mask_names[i].mask != LOG_ALL)
+            {
 		sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
-	    level -= mask_names[i].mask;
+	        level &= ~mask_names[i].mask;
+            }
 	}
     va_start(ap, fmt);
 #ifdef WIN32
@@ -318,19 +337,16 @@ void yaz_log_time_format(const char *fmt)
 /** cleans a loglevel name from leading paths and suffixes */
 static char *clean_name(const char *name, int len, char *namebuf, int buflen)
 {
-    char *p;
-    char *start;
+    char *p = namebuf;
+    char *start = namebuf;
     if (buflen <len)
         len = buflen; 
     strncpy(namebuf, name, len);
     namebuf[len] = '\0';
-    start = namebuf;
-    p = namebuf;
-    while ((p = index(start,'/')))
+    while ((p = strchr(start,'/')))
         start = p+1;
-    if ((p = rindex(start,'.')))
+    if ((p = strrchr(start,'.')))
         *p = '\0';
-    /*logf(LOG_LOG,"cleaned '%.*s' to '%s' ", len,name, start); */ 
     return start;
 
 }
@@ -360,7 +376,14 @@ int yaz_log_module_level(const char *name)
     char *n = clean_name(name, strlen(name), clean, sizeof(clean));
     for (i = 0; mask_names[i].name; i++)
         if (0==strcmp(n,mask_names[i].name))
+        {
+            yaz_log(LOG_LOGLVL,"returning log bit 0x%x for '%s' %s",
+                    mask_names[i].mask, n, 
+                    strcmp(n,name)?name:"" );
             return mask_names[i].mask;
+        }
+    yaz_log(LOG_LOGLVL,"returning NO log bit for '%s' %s", n, 
+                    strcmp(n,name)?name:"" );
     return 0;
 }
 
@@ -374,15 +397,22 @@ int yaz_log_mask_str_x (const char *str, int level)
     const char *p;
     int i;
     int found;
+    int negated;
     char clean[255] = "";
     char *n = clean;
 
     while (*str)
     {
         found = 0;
+        negated=0;
         for (p = str; *p && *p != ','; p++)
             ;
-        if (*str == '-' || isdigit(*str))
+        if (*str=='-')
+        {
+            negated=1;
+            str++;
+        }
+        if (isdigit(*str))
         {
             level = atoi (str);
             found = 1;
@@ -391,14 +421,15 @@ int yaz_log_mask_str_x (const char *str, int level)
         {
             n = clean_name(str, p-str, clean, sizeof(clean));
             for (i = 0; mask_names[i].name; i++)
-                /*if (strlen (mask_names[i].name) == (size_t) (p-str) &&
-                    memcmp (mask_names[i].name, str, p-str) == 0)*/
                 if (0==strcmp (mask_names[i].name,n))
                 {
                     if (mask_names[i].mask)
-                        level |= mask_names[i].mask;
+                        if (negated)
+                            level &= ~mask_names[i].mask;
+                        else
+                            level |= mask_names[i].mask;
                     else
-                        level = 0;
+                        level = 0; /* 'none' clears them all */
                     found = 1;
                 }
         }