X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=05a92b3476526e855be7376409de20f658c64276;hp=0bb27e7665b36e1e85930154024bc0370734810c;hb=3f282496986cbae7fd4bd7f95d44bf47a2cc6874;hpb=f1d7bbf6928a24c47f095193375e4c6046979521

diff --git a/src/log.c b/src/log.c
index 0bb27e7..05a92b3 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.31 2006-03-21 12:31:48 adam Exp $
+ * $Id: log.c,v 1.35 2006-05-07 18:26:25 adam Exp $
  */
 
 /**
  * \file log.c
- * \brief Implements logging utility
+ * \brief Logging utility
  */
 
 #if HAVE_CONFIG_H
@@ -70,6 +70,15 @@ enum l_file_type {  use_stderr, use_none, use_file };
 static enum l_file_type yaz_file_type = use_stderr;
 static FILE *yaz_global_log_file = NULL;
 
+static void (*start_hook_func)(int, const char *, void *) = NULL;
+static void *start_hook_info;
+
+static void (*end_hook_func)(int, const char *, void *) = NULL;
+static void *end_hook_info;
+
+static void (*hook_func)(int, const char *, void *) = NULL;
+static void *hook_info;
+
 static char l_prefix[512] = "";
 static char l_prefix2[512] = "";
 static char l_fname[512] = "";
@@ -170,8 +179,8 @@ 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);
@@ -247,21 +256,22 @@ void yaz_log_init_max_size(int mx)
         l_max_size = mx;
 }
 
-static void (*start_hook_func)(int, const char *, void *) = NULL;
-static void *start_hook_info;
-static void (*end_hook_func)(int, const char *, void *) = NULL;
-static void *end_hook_info;
+void yaz_log_set_handler(void (*func)(int, const char *, void *), void *info)
+{
+    hook_func = func;
+    hook_info = info;
+}
 
 void log_event_start(void (*func)(int, const char *, void *), void *info)
 {
-    start_hook_func = func;
-    start_hook_info = info;
+     start_hook_func = func;
+     start_hook_info = info;
 }
 
 void log_event_end(void (*func)(int, const char *, void *), void *info)
 {
-    end_hook_func = func;
-    end_hook_info = info;
+     end_hook_func = func;
+     end_hook_info = info;
 }
 
 static void yaz_log_open_check(struct tm *tm, int force)
@@ -317,6 +327,30 @@ void yaz_log_reopen()
     nmem_mutex_leave(log_mutex);
 }
 
+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;
+#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, FILE *file, const char *buf)
 {
     time_t ti = time(0);
@@ -360,7 +394,7 @@ 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);
@@ -402,7 +436,8 @@ void yaz_log(int level, const char *fmt, ...)
     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, file, buf);