X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Flog.c;h=cfcbf77a0d746e75cd669cbd82cfbbc289c4d59e;hp=46f74ea8e77c017299ad68f28030bd2fec12abaa;hb=06670a04cc9789bc938174a5e99ddaff97386867;hpb=2d978ce2c9706142728e61af13294613b417ec44 diff --git a/util/log.c b/util/log.c index 46f74ea..cfcbf77 100644 --- a/util/log.c +++ b/util/log.c @@ -1,76 +1,18 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: log.c,v $ - * Revision 1.12 1997-05-01 15:08:14 adam - * Added log_mask_str_x routine. - * - * Revision 1.11 1996/02/05 12:24:32 adam - * Implemented log_event_{start,end}-functions. - * - * Revision 1.10 1995/12/06 09:51:27 quinn - * Fixed the log-prefix buffer - it was too small and the setup code lacked - * a bounds-check. - * - * Revision 1.9 1995/09/29 17:12:34 quinn - * Smallish - * - * Revision 1.8 1995/09/27 15:03:02 quinn - * Modified function heads & prototypes. - * - * Revision 1.7 1995/06/19 12:40:18 quinn - * Added log_file() - * - * Revision 1.6 1995/06/15 15:45:03 quinn - * Added date info. - * - * Revision 1.5 1995/05/16 08:51:11 quinn - * License, documentation, and memory fixes - * - * Revision 1.4 1995/05/15 11:56:55 quinn - * Debuggng & adjustments. - * - * Revision 1.3 1995/04/10 10:23:51 quinn - * Fixes. - * - * Revision 1.2 1995/03/31 10:16:55 quinn - * Fixed logging. - * - * Revision 1.1 1995/03/30 10:26:53 quinn - * Logging system - * - * Revision 1.9 1994/12/12 12:09:02 quinn - * Changes - * - * Revision 1.8 1994/11/22 13:15:38 quinn - * Simple - * - * Revision 1.7 1994/10/05 10:16:11 quinn - * Added xrealloc. Fixed bug in log. - * - * Revision 1.6 1994/10/04 14:02:19 quinn - * Fixed log_init - * - * Revision 1.5 1994/09/28 13:07:41 adam - * Implemented log_mask_str. - * - * Revision 1.4 1994/09/27 20:04:13 quinn - * Added fflush. - * - * Revision 1.3 1994/08/18 08:18:48 quinn - * Added prefix to log_init. - * - * Revision 1.2 1994/08/17 14:27:53 quinn - * added LOG_ERRNO - * - * Revision 1.1 1994/08/17 13:23:15 quinn - * First version - * Added log.c * + * $Id: log.c,v 1.36 2003-02-12 14:17:50 heikki Exp $ */ +#if HAVE_CONFIG_H +#include +#endif + +#ifdef WIN32 +#include +#endif + #include #include #include @@ -78,11 +20,26 @@ #include #include #include -#include +#include +#include + +#define HAS_STRERROR 1 + +#if HAS_STRERROR + +#else +char *strerror(int n) +{ + extern char *sys_errlist[]; + return sys_errlist[n]; +} + +#endif static int l_level = LOG_DEFAULT_LEVEL; -static FILE *l_file = stderr; -static char l_prefix[512] = "log"; +static FILE *l_file = NULL; +static char l_prefix[512] = ""; +static char l_prefix2[512] = ""; static struct { int mask; @@ -94,42 +51,71 @@ static struct { { LOG_WARN, "warn" }, { LOG_LOG, "log" }, { LOG_ERRNO, ""}, - { LOG_ALL, "all" }, + { LOG_MALLOC, "malloc"}, + { LOG_APP, "app" }, + { LOG_NOTIME, "" }, + /* { LOG_ALL, "all" }, */ { 0, "none" }, { 0, NULL } }; -#ifndef strerror +FILE *yaz_log_file(void) +{ + if (!l_file) + l_file = stderr; + return l_file; +} -char *strerror(int n) +void yaz_log_init_file (const char *fname) { - extern char *sys_errlist[]; - return sys_errlist[n]; + FILE *new_file; + if (!l_file) + l_file = stderr; + if (!fname || !*fname) + new_file=stderr; + else if (!(new_file = fopen(fname, "a"))) + return; + if (l_file != stderr) + { + fclose (l_file); + } + setvbuf(new_file, 0, _IONBF, 0); + l_file = new_file; } -#endif +void yaz_log_init_level (int level) +{ + l_level = level; +} -FILE *log_file(void) +void yaz_log_init_prefix (const char *prefix) { - return l_file; + if (prefix && *prefix) + sprintf(l_prefix, "%.511s ", prefix); + else + *l_prefix = 0; } -void log_init(int level, const char *prefix, const char *name) +void yaz_log_init_prefix2 (const char *prefix) { - l_level = level; if (prefix && *prefix) - sprintf(l_prefix, "%.512s", prefix); - if (!name || !*name || l_file != stderr) - return; - if (!(l_file = fopen(name, "a"))) - return; - setvbuf(l_file, 0, _IONBF, 0); + sprintf(l_prefix2, "%.511s ", prefix); + else + *l_prefix2 = 0; +} + +void yaz_log_init(int level, const char *prefix, const char *fname) +{ + yaz_log_init_level (level); + yaz_log_init_prefix (prefix); + if (fname && *fname) + yaz_log_init_file (fname); } static void (*start_hook_func)(int, const char *, void *) = NULL; -void *start_hook_info; +static void *start_hook_info; static void (*end_hook_func)(int, const char *, void *) = NULL; -void *end_hook_info; +static void *end_hook_info; void log_event_start (void (*func)(int, const char *, void *), void *info) { @@ -143,18 +129,20 @@ void log_event_end (void (*func)(int, const char *, void *), void *info) end_hook_info = info; } -void logf(int level, const char *fmt, ...) +void yaz_log(int level, const char *fmt, ...) { va_list ap; char buf[4096], flags[1024]; int i; time_t ti; struct tm *tim; - char tbuf[50]; + char tbuf[50]=""; int o_level = level; if (!(level & l_level)) return; + if (!l_file) + l_file = stderr; *flags = '\0'; for (i = 0; level && mask_names[i].name; i++) if (mask_names[i].mask & level) @@ -164,26 +152,45 @@ void logf(int level, const char *fmt, ...) level -= mask_names[i].mask; } va_start(ap, fmt); +#ifdef WIN32 + _vsnprintf(buf, sizeof(buf)-1, fmt, ap); +#else +/* !WIN32 */ +#if HAVE_VSNPRINTF + vsnprintf(buf, sizeof(buf), fmt, ap); +#else vsprintf(buf, fmt, ap); +#endif +#endif +/* WIN32 */ if (o_level & LOG_ERRNO) - sprintf(buf + strlen(buf), " [%s]", strerror(errno)); + { + strcat(buf, " ["); + yaz_strerror(buf+strlen(buf), 2048); + strcat(buf, "]"); + } + va_end (ap); if (start_hook_func) (*start_hook_func)(o_level, buf, start_hook_info); ti = time(0); tim = localtime(&ti); - strftime(tbuf, 50, "%H:%M:%S-%d/%m", tim); - fprintf(l_file, "%s: %s: %s %s\n", tbuf, l_prefix, flags, buf); + if (l_level & LOG_NOTIME) + tbuf[0]='\0'; + else + strftime(tbuf, 50, "%H:%M:%S-%d/%m: ", tim); + fprintf(l_file, "%s%s%s %s%s\n", tbuf, l_prefix, flags, + l_prefix2, buf); fflush(l_file); if (end_hook_func) (*end_hook_func)(o_level, buf, end_hook_info); } -int log_mask_str (const char *str) +int yaz_log_mask_str (const char *str) { - return log_mask_str_x (str, LOG_DEFAULT_LEVEL); + return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL); } -int log_mask_str_x (const char *str, int level) +int yaz_log_mask_str_x (const char *str, int level) { const char *p; int i; @@ -196,7 +203,7 @@ int log_mask_str_x (const char *str, int level) level = atoi (str); else for (i = 0; mask_names[i].name; i++) - if (strlen (mask_names[i].name) == p-str && + if (strlen (mask_names[i].name) == (size_t) (p-str) && memcmp (mask_names[i].name, str, p-str) == 0) { if (mask_names[i].mask)