/*
- * 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.28 2005-09-16 21:13:54 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
#define HAS_STRERROR 1
+
#if HAS_STRERROR
#else
#endif
-static int l_level = YLOG_DEFAULT_LEVEL;
-static FILE *l_file = NULL;
+
+static int default_log_level() {
+ char *env = getenv("YAZ_LOG");
+ if (env != 0)
+ return yaz_log_mask_str_x(env, YLOG_DEFAULT_LEVEL);
+ else
+ return YLOG_DEFAULT_LEVEL;
+}
+
+
+static int l_level = -1; /* will be set from default_log_level() */
+
+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] = "";
+
static char l_old_default_format[] = "%H:%M:%S-%d/%m";
static char l_new_default_format[] = "%Y%m%d-%H%M%S";
#define TIMEFORMAT_LEN 50
FILE *yaz_log_file(void)
{
- if (!l_file)
- l_file = stderr;
- return l_file;
+ FILE *f = 0;
+ switch(yaz_file_type)
+ {
+ case use_stderr: f = stderr; break;
+ case use_none: f = 0; break;
+ case use_file: f = yaz_global_log_file; break;
+ }
+ return f;
+}
+
+void yaz_log_close()
+{
+ if (yaz_file_type == use_file && yaz_global_log_file)
+ {
+ fclose(yaz_global_log_file);
+ yaz_global_log_file = 0;
+ }
}
void yaz_log_init_file(const char *fname)
{
init_mutex();
+
+ yaz_log_close();
if (fname)
{
+ if (*fname == '\0')
+ yaz_file_type = use_stderr; /* empty name; use stderr */
+ else
+ yaz_file_type = use_file;
strncpy(l_fname, fname, sizeof(l_fname)-1);
l_fname[sizeof(l_fname)-1] = '\0';
}
else
- l_fname[0] = '\0';
+ {
+ yaz_file_type = use_none; /* NULL name; use no file at all */
+ l_fname[0] = '\0';
+ }
yaz_log_reopen();
}
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);
void yaz_log_init_level(int level)
{
init_mutex();
+ if (l_level < 0) l_level = default_log_level();
if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
{
l_level = level;
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(int force)
+static void yaz_log_open_check(struct tm *tm, int force)
{
char new_filename[512];
static char cur_filename[512] = "";
- time_t new_time;
- static time_t cur_time = 0;
- struct tm tm;
-
- nmem_mutex_enter(log_mutex);
- if (!l_file)
- l_file = stderr;
if (l_fname && *l_fname)
{
- time(&new_time);
- if (new_time != cur_time)
+ strftime(new_filename, sizeof(new_filename)-1, l_fname, tm);
+ if (strcmp(new_filename, cur_filename))
{
- cur_time = new_time;
- localtime_r(&new_time, &tm);
-
- strftime(new_filename, sizeof(new_filename)-1, l_fname, &tm);
- if (strcmp(new_filename, cur_filename))
- {
- strcpy(cur_filename, new_filename);
- force = 1;
- }
- }
- if (l_max_size > 0 && (l_file && l_file != stderr))
- {
- long flen = ftell(l_file);
- if (flen > l_max_size)
- {
- rotate_log(cur_filename);
- force = 1;
- }
+ strcpy(cur_filename, new_filename);
+ force = 1;
}
- if (force)
+ }
+
+ if (l_max_size > 0 && yaz_global_log_file && yaz_file_type == use_file)
+ {
+ long flen = ftell(yaz_global_log_file);
+ if (flen > l_max_size)
{
- if (l_file && l_file != stderr)
- fclose(l_file);
- l_file = fopen(cur_filename, "a");
- if (l_level & YLOG_FLUSH)
- setvbuf(l_file, 0, _IONBF, 0);
+ rotate_log(cur_filename);
+ force = 1;
}
}
- nmem_mutex_leave(log_mutex);
+ if (force && yaz_file_type == use_file && *cur_filename)
+ {
+ yaz_log_close();
+ yaz_global_log_file = fopen(cur_filename, "a");
+ 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()
{
- yaz_log_open_check(1);
+ time_t cur_time = time(0);
+#if HAVE_LOCALTIME_R
+ struct tm tm0, *tm = &tm0;
+#else
+ struct tm *tm;
+#endif
+
+ nmem_mutex_enter(log_mutex);
+#if HAVE_LOCALTIME_R
+ localtime_r(&cur_time, tm);
+#else
+ tm = localtime(&cur_time);
+#endif
+ yaz_log_open_check(tm, 1);
+ nmem_mutex_leave(log_mutex);
}
-void yaz_log(int level, const char *fmt, ...)
+static void yaz_strftime(char *dst, size_t sz,
+ const char *fmt, const struct tm *tm)
{
- va_list ap;
- char buf[4096], flags[1024];
+ 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);
int i;
- time_t ti;
- struct tm *tim;
- char tbuf[TIMEFORMAT_LEN] = "";
- int o_level = level;
+#if HAVE_LOCALTIME_R
+ struct tm tm0, *tm = &tm0;
+#else
+ struct tm *tm;
+#endif
- if (!(level & l_level))
- return;
init_mutex();
- yaz_log_open_check(0);
-
nmem_mutex_enter(log_mutex);
- if (!l_file)
- l_file = stderr;
- *flags = '\0';
- for (i = 0; level && mask_names[i].name; i++)
- if ( mask_names[i].mask & level)
- {
- if (*mask_names[i].name && mask_names[i].mask &&
- mask_names[i].mask != YLOG_ALL)
+ #if HAVE_LOCALTIME_R
+ localtime_r(&ti, tm);
+#else
+ tm = localtime(&ti);
+#endif
+
+ yaz_log_open_check(tm, 0);
+ file = yaz_log_file(); /* file may change in yaz_log_open_check */
+
+ if (file)
+ {
+ char tbuf[TIMEFORMAT_LEN];
+ char flags[1024];
+
+ *flags = '\0';
+ for (i = 0; level && mask_names[i].name; i++)
+ if ( mask_names[i].mask & level)
{
- sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
- level &= ~mask_names[i].mask;
+ if (*mask_names[i].name && mask_names[i].mask &&
+ mask_names[i].mask != YLOG_ALL)
+ {
+ sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
+ level &= ~mask_names[i].mask;
+ }
}
- }
+
+ if (l_level & YLOG_NOTIME)
+ tbuf[0] = '\0';
+ else
+ 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);
+ if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
+ fflush(file);
+ }
+ nmem_mutex_leave(log_mutex);
+}
+
+void yaz_log(int level, const char *fmt, ...)
+{
+ va_list ap;
+ char buf[4096];
+ FILE *file;
+ int o_level = level;
+ if (l_level < 0)
+ l_level = default_log_level();
+ if (!(level & l_level))
+ return;
va_start(ap, fmt);
#ifdef WIN32
_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
va_end (ap);
if (start_hook_func)
(*start_hook_func)(o_level, buf, start_hook_info);
- ti = time(0);
- tim = localtime(&ti);
- if (l_level & YLOG_NOTIME)
- tbuf[0] = '\0';
- else
- strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
- tbuf[TIMEFORMAT_LEN-1] = '\0';
- fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags,
- l_prefix2, buf);
- if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
- fflush(l_file);
+ 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);
- nmem_mutex_leave(log_mutex);
}
void yaz_log_time_format(const char *fmt)
int yaz_log_mask_str(const char *str)
{
- return yaz_log_mask_str_x(str, YLOG_DEFAULT_LEVEL);
+ return yaz_log_mask_str_x(str, default_log_level());
}
int yaz_log_mask_str_x(const char *str, int level)
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
-
projects / yaz-moved-to-github.git / blobdiff