X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=e8aa1a83e5e36865c6bf345a2d5b7a57da3cfb4f;hp=024982b50ecc258fe49a7c7597e4c41c7c43d224;hb=905df6869e5ad8ab9f34590cce771fe50c444473;hpb=5d309bb5cfcf1fd46efb31c6d240aeb36fc915b5

diff --git a/src/log.c b/src/log.c
index 024982b..e8aa1a8 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.12 2004-11-04 14:19:58 heikki Exp $
+ * $Id: log.c,v 1.19 2004-12-30 00:11:00 adam Exp $
  */
 
 /**
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
-#include <yaz/nmem.h>
+#include <yaz/xmalloc.h>
 
 static NMEM_MUTEX log_mutex = 0;
 static int mutex_init_flag = 0; /* not yet initialized */
@@ -55,7 +55,7 @@ char *strerror(int n)
 
 
 
-static int l_level = LOG_DEFAULT_LEVEL;
+static int l_level = YLOG_DEFAULT_LEVEL;
 static FILE *l_file = NULL;
 static char l_prefix[512] = "";
 static char l_prefix2[512] = "";
@@ -77,23 +77,24 @@ static struct {
     char *name;
 }  mask_names[MAX_MASK_NAMES] =
 {
-    { LOG_FATAL,  "fatal"},
-    { LOG_DEBUG,  "debug"},
-    { LOG_WARN,   "warn" },
-    { LOG_LOG,    "log"  },
-    { LOG_ERRNO,  ""},
-    { LOG_MALLOC, "malloc"},
-    { LOG_APP,    "app"  },
-    { LOG_NOTIME, "" },
-    { LOG_APP2,   "app2" },
-    { LOG_APP3,   "app3" },
-    { LOG_ALL,    "all"  },
-    { LOG_FLUSH,  "flush" },
+    { YLOG_FATAL,  "fatal"},
+    { YLOG_DEBUG,  "debug"},
+    { YLOG_WARN,   "warn" },
+    { YLOG_LOG,    "log"  },
+    { YLOG_ERRNO,  ""},
+    { YLOG_MALLOC, "malloc"},
+ /*   { YLOG_APP,    "app"  }, */
+    { YLOG_NOTIME, "notime" },
+ /*   { YLOG_APP2,   "app2" }, */
+ /*   { YLOG_APP3,   "app3" }, */
+    { YLOG_ALL,    "all"  },
+    { YLOG_FLUSH,  "flush" },
+    { YLOG_LOGLVL, "loglevel" }, 
     { 0,          "none" },
     { 0, NULL }
     /* the rest will be filled in if the user defines dynamic modules*/
 };  
-static unsigned int next_log_bit = LOG_LAST_BIT<<1; /* first dynamic bit */
+static unsigned int next_log_bit = YLOG_LAST_BIT<<1; /* first dynamic bit */
 
 static void init_mutex()
 {
@@ -140,7 +141,7 @@ void yaz_log_reopen(void)
     {
         fclose (l_file);
     }
-    if (l_level & LOG_FLUSH)
+    if (l_level & YLOG_FLUSH)
         setvbuf(new_file, 0, _IONBF, 0);
     l_file = new_file;
 }
@@ -156,6 +157,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
@@ -166,12 +168,28 @@ static void rotate_log()
 
 void yaz_log_init_level (int level)
 {
-    if ( (l_level & LOG_FLUSH) != (level & LOG_FLUSH) )
+    if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
     {
         l_level = level;
         yaz_log_reopen(); /* make sure we set buffering right */
     } else
         l_level = level;
+    if (l_level  & YLOG_LOGLVL)
+    {  /* dump the log level bits */
+        char *bittype="Static ";
+        int i;
+        yaz_log(YLOG_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(YLOG_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>YLOG_LAST_BIT)
+                    bittype="Dynamic";
+                }
+    }
 }
 
 void yaz_log_init_prefix (const char *prefix)
@@ -257,7 +275,7 @@ void yaz_log(int level, const char *fmt, ...)
     	if ( mask_names[i].mask & level)
     	{
 	    if (*mask_names[i].name && mask_names[i].mask && 
-                 mask_names[i].mask != LOG_ALL)
+                 mask_names[i].mask != YLOG_ALL)
             {
 		sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
 	        level &= ~mask_names[i].mask;
@@ -275,7 +293,7 @@ void yaz_log(int level, const char *fmt, ...)
 #endif
 #endif
 /* WIN32 */
-    if (o_level & LOG_ERRNO)
+    if (o_level & YLOG_ERRNO)
     {
         strcat(buf, " [");
         yaz_strerror(buf+strlen(buf), 2048);
@@ -286,14 +304,14 @@ void yaz_log(int level, const char *fmt, ...)
         (*start_hook_func)(o_level, buf, start_hook_info);
     ti = time(0);
     tim = localtime(&ti);
-    if (l_level & LOG_NOTIME)
+    if (l_level & YLOG_NOTIME)
 	tbuf[0] = '\0';
     else
 	strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
     tbuf[TIMEFORMAT_LEN-1] = '\0';
     fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags,
             l_prefix2, buf);
-    if (l_level & (LOG_FLUSH|LOG_DEBUG) )
+    if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
         fflush(l_file);
     if (end_hook_func)
 	(*end_hook_func)(o_level, buf, end_hook_info);
@@ -320,19 +338,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;
 
 }
@@ -344,7 +359,7 @@ static int define_module_bit(const char *name)
         ;
     if ( (i>=MAX_MASK_NAMES) || (next_log_bit >= 1<<31 ))
     {
-        yaz_log(LOG_WARN,"No more log bits left, not logging '%s'", name);
+        yaz_log(YLOG_WARN,"No more log bits left, not logging '%s'", name);
         return 0;
     }
     mask_names[i].mask = next_log_bit;
@@ -362,29 +377,41 @@ 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(YLOG_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(YLOG_LOGLVL,"returning NO log bit for '%s' %s", n, 
+                    strcmp(n,name)?name:"" );
     return 0;
 }
 
 int yaz_log_mask_str (const char *str)
 {
-    return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL);
+    return yaz_log_mask_str_x (str, YLOG_DEFAULT_LEVEL);
 }
 
 int yaz_log_mask_str_x (const char *str, int level)
 {
     const char *p;
     int i;
-    int found;
     char clean[255] = "";
     char *n = clean;
 
     while (*str)
     {
-        found = 0;
+        int found = 0;
+        int negated = 0;
         for (p = str; *p && *p != ','; p++)
             ;
-        if (*str == '-' || isdigit(*str))
+        if (*str=='-')
+        {
+            negated=1;
+            str++;
+        }
+        if (isdigit(*(unsigned char *) str))
         {
             level = atoi (str);
             found = 1;
@@ -393,14 +420,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;
                 }
         }