X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=5c41f07a2943f6b6457de16c43a22984983214ed;hb=60fa9058b47df51d7ca169c3c75b72988d345119;hp=e9fcea4e0eb629051b7face7a0b36ed7949d2e0a;hpb=41b946725f2c8d8617b3e4ece161cb9d99bfaa5c;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index e9fcea4..5c41f07 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.32 2006-03-21 12:54:02 adam Exp $
+ * $Id: log.c,v 1.37 2006-07-06 13:10:31 heikki 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,14 +179,15 @@ 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();
@@ -247,16 +257,25 @@ void yaz_log_init_max_size(int mx)
         l_max_size = mx;
 }
 
-static void (*hook_func)(int, const char *, void *) = NULL;
-static void *hook_info;
-
 void yaz_log_set_handler(void (*func)(int, const char *, void *), void *info)
 {
     hook_func = func;
     hook_info = info;
 }
 
-static void yaz_log_open_check(struct tm *tm, int force)
+void log_event_start(void (*func)(int, const char *, void *), void *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;
+}
+
+static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
 {
     char new_filename[512];
     static char cur_filename[512] = "";
@@ -283,14 +302,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
@@ -305,10 +324,50 @@ 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);
 }
 
+
+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, FILE *file, const char *buf)
 {
     time_t ti = time(0);
@@ -329,7 +388,7 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
     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)
@@ -352,7 +411,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);
@@ -392,12 +451,15 @@ void yaz_log(int level, const char *fmt, ...)
         strcat(buf, "]");
     }
     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);
+    if (end_hook_func)
+        (*end_hook_func)(o_level, buf, end_hook_info);
 }
 
 void yaz_log_time_format(const char *fmt)