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

diff --git a/src/log.c b/src/log.c
index 4e0b6d9..d4973f2 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.33 2006-03-21 13:58:50 adam Exp $
+ * $Id: log.c,v 1.38 2006-07-31 10:05:04 adam Exp $
  */
 
 /**
  * \file log.c
- * \brief Implements logging utility
+ * \brief Logging utility
  */
 
 #if HAVE_CONFIG_H
@@ -179,23 +179,26 @@ static void rotate_log(const char *cur_fname)
     strcat(newname, ".1");
 #ifdef WIN32
     /* windows can't rename a file if it is open */
-    fclose(l_file);
-    l_file = 0;
+    fclose(yaz_global_log_file);
+    yaz_global_log_file = 0;
     MoveFileEx(cur_fname, newname, MOVEFILE_REPLACE_EXISTING);
 #else
     rename(cur_fname, newname);
 #endif
 }
 
+
 void yaz_log_init_level(int level)
 {
     init_mutex();
-    if (l_level < 0) l_level = default_log_level();
+    if (l_level < 0) 
+        l_level = default_log_level();
     if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
     {
         l_level = level;
         yaz_log_reopen(); /* make sure we set buffering right */
-    } else
+    } 
+    else
         l_level = level;
     if (l_level  & YLOG_LOGLVL)
     {  /* dump the log level bits */
@@ -274,7 +277,7 @@ void log_event_end(void (*func)(int, const char *, void *), void *info)
      end_hook_info = info;
 }
 
-static void yaz_log_open_check(struct tm *tm, int force)
+static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
 {
     char new_filename[512];
     static char cur_filename[512] = "";
@@ -301,14 +304,14 @@ static void yaz_log_open_check(struct tm *tm, int force)
     if (force && yaz_file_type == use_file && *cur_filename)
     {
         yaz_log_close();
-        yaz_global_log_file = fopen(cur_filename, "a");
+        yaz_global_log_file = fopen(cur_filename, filemode);
         if (l_level < 0) l_level = default_log_level();
         if (l_level & YLOG_FLUSH)
             setvbuf(yaz_global_log_file, 0, _IONBF, 0);
     }
 }
 
-void yaz_log_reopen()
+static void yaz_log_do_reopen(const char *filemode)
 {
     time_t cur_time = time(0);
 #if HAVE_LOCALTIME_R
@@ -323,14 +326,54 @@ void yaz_log_reopen()
 #else
     tm = localtime(&cur_time);
 #endif
-    yaz_log_open_check(tm, 1);
+    yaz_log_open_check(tm, 1, filemode);
     nmem_mutex_leave(log_mutex);
 }
 
-static void yaz_log_to_file(int level, FILE *file, const char *buf)
+
+void yaz_log_reopen()
 {
+    yaz_log_do_reopen("a");
+}
+
+void yaz_log_trunc()
+{
+    yaz_log_do_reopen("w");
+}
+
+
+
+static void yaz_strftime(char *dst, size_t sz,
+                         const char *fmt, const struct tm *tm)
+{
+    const char *cp = strstr(fmt, "%!");
+    if (cp && strlen(fmt) < 60)
+    {
+        char fmt2[80];
+        char tpidstr[20];
+#ifdef WIN32
+        DWORD tid = GetCurrentThreadId();
+#else
+        long tid = 0;
+#if YAZ_POSIX_THREADS
+        tid = pthread_self();
+#endif
+#endif
+        memcpy(fmt2, fmt, cp-fmt);
+        fmt2[cp-fmt] = '\0';
+        sprintf(tpidstr, "%08lx", (long) tid);
+        strcat(fmt2, tpidstr);
+        strcat(fmt2, cp+2);
+        strftime(dst, sz, fmt2, tm);     
+    }
+    else
+        strftime(dst, sz, fmt, tm);
+}
+                            
+static void yaz_log_to_file(int level, const char *log_message)
+{
+    FILE *file;
     time_t ti = time(0);
-    int i;
 #if HAVE_LOCALTIME_R
     struct tm tm0, *tm = &tm0;
 #else
@@ -340,20 +383,21 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
     init_mutex();
 
     nmem_mutex_enter(log_mutex);
-
-    #if HAVE_LOCALTIME_R
+    
+#if HAVE_LOCALTIME_R
     localtime_r(&ti, tm);
 #else
     tm = localtime(&ti);
 #endif
     
-    yaz_log_open_check(tm, 0);  
+    yaz_log_open_check(tm, 0, "a");  
     file = yaz_log_file(); /* file may change in yaz_log_open_check */
 
     if (file)
     {
         char tbuf[TIMEFORMAT_LEN];
         char flags[1024];
+        int i;
         
         *flags = '\0';
         for (i = 0; level && mask_names[i].name; i++)
@@ -370,10 +414,11 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
         if (l_level & YLOG_NOTIME)
             tbuf[0] = '\0';
         else
-            strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tm);
+            yaz_strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tm);
         tbuf[TIMEFORMAT_LEN-1] = '\0';
         
-        fprintf(file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, buf);
+        fprintf(file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2,
+                log_message);
         if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
             fflush(file);
     }
@@ -416,7 +461,7 @@ void yaz_log(int level, const char *fmt, ...)
         (*hook_func)(o_level, buf, hook_info);
     file = yaz_log_file();
     if (file)
-        yaz_log_to_file(level, file, buf);
+        yaz_log_to_file(level, buf);
     if (end_hook_func)
         (*end_hook_func)(o_level, buf, end_hook_info);
 }