X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=8bc5ad06895568b1ca63263e138d4350487f778d;hp=28ffba572dee58f3df1fdcafe80a3b7f330abc23;hb=d654b817f2bdb80102dd663d78f31ab3eea4f6bd;hpb=4f3bcae93d51a26709c12b51261c3d95af610cb2

diff --git a/src/log.c b/src/log.c
index 28ffba5..8bc5ad0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
@@ -30,8 +30,12 @@
 #include <yaz/errno.h>
 #include <yaz/thread_id.h>
 #include <yaz/log.h>
+#include <yaz/mutex.h>
 #include <yaz/snprintf.h>
 #include <yaz/xmalloc.h>
+#if YAZ_POSIX_THREADS
+#include <pthread.h>
+#endif
 
 static int l_level = YLOG_DEFAULT_LEVEL;
 
@@ -87,33 +91,44 @@ static struct {
     { YLOG_TID,    "tid"  },
     { YLOG_APP,    "app"   },
     { YLOG_NOTIME, "notime" },
-    { YLOG_APP2,   "app2" }, 
+    { YLOG_APP2,   "app2" },
     { YLOG_APP3,   "app3" },
     { YLOG_ALL,    "all"  },
     { YLOG_FLUSH,  "flush" },
-    { YLOG_LOGLVL, "loglevel" }, 
+    { 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 = YLOG_LAST_BIT<<1; /* first dynamic bit */
 
-static void internal_log_init(void)
+static YAZ_MUTEX log_mutex = 0;
+
+void yaz_log_lock(void)
 {
-    static int mutex_init_flag = 0; /* not yet initialized */
-    char *env;
+    yaz_mutex_enter(log_mutex);
+}
 
-    if (mutex_init_flag)
-        return;
-    mutex_init_flag = 1; /* here, 'cause nmem_mutex_create may call yaz_log */
+void yaz_log_unlock(void)
+{
+    yaz_mutex_leave(log_mutex);
+}
 
+void yaz_log_init_globals(void)
+{
+    char *env;
+
+    if (log_mutex == 0)
+        yaz_mutex_create(&log_mutex);
+#if YAZ_POSIX_THREADS
+    pthread_atfork(yaz_log_lock, yaz_log_unlock, yaz_log_unlock);
+#endif
     env = getenv("YAZ_LOG");
     if (env)
         l_level = yaz_log_mask_str_x(env, l_level);
 }
 
-
 FILE *yaz_log_file(void)
 {
     FILE *f = 0;
@@ -137,7 +152,7 @@ void yaz_log_close(void)
 
 void yaz_log_init_file(const char *fname)
 {
-    internal_log_init();
+    yaz_init_globals();
 
     yaz_log_close();
     if (fname)
@@ -152,7 +167,7 @@ void yaz_log_init_file(const char *fname)
     else
     {
         yaz_log_info.type = use_none;  /* NULL name; use no file at all */
-        yaz_log_info.l_fname[0] = '\0'; 
+        yaz_log_info.l_fname[0] = '\0';
     }
     yaz_log_reopen();
 }
@@ -197,12 +212,12 @@ static void rotate_log(const char *cur_fname)
 
 void yaz_log_init_level(int level)
 {
-    internal_log_init();
+    yaz_init_globals();
     if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
     {
         l_level = level;
         yaz_log_reopen(); /* make sure we set buffering right */
-    } 
+    }
     else
         l_level = level;
 
@@ -250,7 +265,7 @@ void yaz_log_init_prefix2(const char *prefix)
 
 void yaz_log_init(int level, const char *prefix, const char *fname)
 {
-    internal_log_init();
+    yaz_init_globals();
     yaz_log_init_level(level);
     yaz_log_init_prefix(prefix);
     if (fname && *fname)
@@ -317,13 +332,14 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
 #ifdef WIN32
         yaz_log_close();
 #endif
-        new_file = fopen(cur_filename, filemode);
+        if (!strncmp(cur_filename, "fd=", 3))
+            new_file = fdopen(atoi(cur_filename + 3), filemode);
+        else
+            new_file = fopen(cur_filename, filemode);
         if (new_file)
         {
             yaz_log_close();
             yaz_log_info.log_file = new_file;
-            if (l_level & YLOG_FLUSH)
-                setvbuf(yaz_log_info.log_file, 0, _IONBF, 0);
         }
         else
         {
@@ -342,12 +358,14 @@ static void yaz_log_do_reopen(const char *filemode)
     struct tm *tm;
 #endif
 
+    yaz_log_lock();
 #if HAVE_LOCALTIME_R
     localtime_r(&cur_time, tm);
 #else
     tm = localtime(&cur_time);
 #endif
     yaz_log_open_check(tm, 1, filemode);
+    yaz_log_unlock();
 }
 
 
@@ -366,8 +384,9 @@ static void yaz_strftime(char *dst, size_t sz,
 {
     strftime(dst, sz, fmt, tm);
 }
-                            
-static void yaz_log_to_file(int level, const char *log_message)
+
+static void yaz_log_to_file(int level, const char *fmt, va_list ap,
+                            const char *error_cp)
 {
     FILE *file;
     time_t ti = time(0);
@@ -377,15 +396,14 @@ static void yaz_log_to_file(int level, const char *log_message)
     struct tm *tm;
 #endif
 
-    internal_log_init();
-
+    yaz_log_lock();
 #if HAVE_LOCALTIME_R
     localtime_r(&ti, tm);
 #else
     tm = localtime(&ti);
 #endif
-    
-    yaz_log_open_check(tm, 0, "a");  
+
+    yaz_log_open_check(tm, 0, "a");
     file = yaz_log_file(); /* file may change in yaz_log_open_check */
 
     if (file)
@@ -394,15 +412,15 @@ static void yaz_log_to_file(int level, const char *log_message)
         char tid[TID_LEN];
         char flags[1024];
         int i;
-        
+
         *flags = '\0';
         for (i = 0; level && mask_names[i].name; i++)
             if ( mask_names[i].mask & level)
             {
-                if (*mask_names[i].name && mask_names[i].mask && 
+                if (*mask_names[i].name && mask_names[i].mask &&
                     mask_names[i].mask != YLOG_ALL)
                 {
-                    if (strlen(flags) + strlen(mask_names[i].name) 
+                    if (strlen(flags) + strlen(mask_names[i].name)
                                              <   sizeof(flags) - 4)
                     {
                         strcat(flags, "[");
@@ -412,7 +430,7 @@ static void yaz_log_to_file(int level, const char *log_message)
                     level &= ~mask_names[i].mask;
                 }
             }
-       
+
         tbuf[0] = '\0';
         if (!(l_level & YLOG_NOTIME))
         {
@@ -430,64 +448,71 @@ static void yaz_log_to_file(int level, const char *log_message)
                 strcat(tid, " ");
         }
 
-        fprintf(file, "%s%s%s%s %s%s\n", tbuf, yaz_log_info.l_prefix,
-                tid, flags, yaz_log_info.l_prefix2,
-                log_message);
+        fprintf(file, "%s%s%s%s %s", tbuf, yaz_log_info.l_prefix,
+                tid, flags, yaz_log_info.l_prefix2);
+        vfprintf(file, fmt, ap);
+        if (error_cp)
+            fprintf(file, " [%s]", error_cp);
+        fputs("\n", file);
         if (l_level & YLOG_FLUSH)
             fflush(file);
     }
+    yaz_log_unlock();
 }
 
 void yaz_log(int level, const char *fmt, ...)
 {
     va_list ap;
-    char buf[4096];
     FILE *file;
     int o_level = level;
+    char *error_cp = 0, error_buf[128];
 
-    internal_log_init();
+    if (o_level & YLOG_ERRNO)
+    {
+        yaz_strerror(error_buf, sizeof(error_buf));
+        error_cp = error_buf;
+    }
+    yaz_init_globals();
     if (!(level & l_level))
         return;
     va_start(ap, fmt);
 
-    /* 30 is enough for our 'rest of output' message */
-    yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
-    if (strlen(buf) >= sizeof(buf)-31)
-        strcat(buf, " [rest of output omitted]");
-
-    if (o_level & YLOG_ERRNO)
+    file = yaz_log_file();
+    if (start_hook_func || hook_func || end_hook_func)
     {
-        size_t remain = sizeof(buf) - strlen(buf);
-        if (remain > 100) /* reasonable minimum space for error */
-        {
-            strcat(buf, " [");
-            yaz_strerror(buf+strlen(buf), remain-5); /* 5 due to extra [] */
-            strcat(buf, "]");
-        }
+        char buf[1024];
+        /* 30 is enough for our 'rest of output' message */
+        yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
+        if (strlen(buf) >= sizeof(buf)-31)
+            strcat(buf, " [rest of output omitted]");
+        if (start_hook_func)
+            (*start_hook_func)(o_level, buf, start_hook_info);
+        if (hook_func)
+            (*hook_func)(o_level, buf, hook_info);
+        if (file)
+            yaz_log_to_file(level, fmt, ap, error_cp);
+        if (end_hook_func)
+            (*end_hook_func)(o_level, buf, end_hook_info);
     }
-    va_end (ap);
-    if (start_hook_func)
-        (*start_hook_func)(o_level, buf, start_hook_info);
-    if (hook_func)
-        (*hook_func)(o_level, buf, hook_info);
-    file = yaz_log_file();
-    if (file)
-        yaz_log_to_file(level, buf);
-    if (end_hook_func)
-        (*end_hook_func)(o_level, buf, end_hook_info);
+    else
+    {
+        if (file)
+            yaz_log_to_file(level, fmt, ap, error_cp);
+    }
+    va_end(ap);
 }
 
 void yaz_log_time_format(const char *fmt)
 {
-    if ( !fmt || !*fmt) 
+    if ( !fmt || !*fmt)
     { /* no format, default to new */
         l_actual_format = l_new_default_format;
-        return; 
+        return;
     }
     if (0==strcmp(fmt, "old"))
     { /* force the old format */
         l_actual_format = l_old_default_format;
-        return; 
+        return;
     }
     /* else use custom format */
     strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1);
@@ -501,7 +526,7 @@ static char *clean_name(const char *name, size_t len, char *namebuf, size_t bufl
     char *p = namebuf;
     char *start = namebuf;
     if (buflen <= len)
-        len = buflen-1; 
+        len = buflen-1;
     strncpy(namebuf, name, len);
     namebuf[len] = '\0';
     while ((p = strchr(start, '/')))
@@ -539,32 +564,33 @@ int yaz_log_module_level(const char *name)
     int i;
     char clean[255];
     char *n = clean_name(name, strlen(name), clean, sizeof(clean));
-    internal_log_init();
-    
+    yaz_init_globals();
+
     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, 
+                    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, 
+    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)
 {
-    internal_log_init(); /* since l_level may be affected */
+    yaz_init_globals(); /* since l_level may be affected */
     return yaz_log_mask_str_x(str, l_level);
 }
 
+/* this function is called by yaz_log_init_globals & yaz_init_globals
+   and, thus, may not call any of them indirectly */
 int yaz_log_mask_str_x(const char *str, int level)
 {
     const char *p;
 
-    internal_log_init();
     while (*str)
     {
         int negated = 0;
@@ -579,7 +605,7 @@ int yaz_log_mask_str_x(const char *str, int level)
         {
             level = atoi(str);
         }
-        else 
+        else
         {
             char clean[509];
             char *n = clean_name(str, (size_t) (p - str), clean, sizeof(clean));