* 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.34 2006-03-24 13:58:43 adam Exp $
*/
/**
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] = "";
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);
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];
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);
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);
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)