Reestablish log_event_{start,end}.

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 7f1b04b..2cd4865 100644 (file)
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.35 2006-03-21 12:54:02 adam Exp $
+ * $Id: log.h,v 1.36 2006-03-21 13:58:50 adam Exp $
  */
 
 /**
@@ -137,6 +137,12 @@ YAZ_EXPORT void yaz_log_set_handler(void (*func)(int, const char *,
 
 YAZ_EXPORT void yaz_log_reopen(void);
 
+YAZ_EXPORT void log_event_start(void (*func)(int level, const char *msg,
+                                             void *info), void *info);
+
+YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg,
+                                           void *info), void *info);
+
 #if YAZ_USE_NEW_LOG
 
 #else

diff --git a/src/log.c b/src/log.c
index e9fcea4..4e0b6d9 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, 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.33 2006-03-21 13:58:50 adam Exp $
  */
 
 /**
@@ -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] = "";
@@ -247,15 +256,24 @@ 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;
 }
 
+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)
 {
     char new_filename[512];
@@ -392,12 +410,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)