X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=e208fbf2f9eb7748ef95346945e87793850c0f36;hb=50319ad67f5bae49fc9449bd6105dfa357f2dbb3;hp=46412aff0b92aa87a8ae173085d0f17e6726067e;hpb=f576c6403441fc35f85a3e57f9423ff07d052de1;p=yaz-moved-to-github.git diff --git a/util/log.c b/util/log.c index 46412af..e208fbf 100644 --- a/util/log.c +++ b/util/log.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: log.c,v 1.27 2002-06-18 21:30:39 adam Exp $ + * $Id: log.c,v 1.29 2002-09-25 12:37:07 adam Exp $ */ #if HAVE_CONFIG_H @@ -38,6 +38,7 @@ char *strerror(int n) static int l_level = LOG_DEFAULT_LEVEL; static FILE *l_file = NULL; static char l_prefix[512] = ""; +static char l_prefix2[512] = ""; static struct { int mask; @@ -92,6 +93,14 @@ void yaz_log_init_prefix (const char *prefix) *l_prefix = 0; } +void yaz_log_init_prefix2 (const char *prefix) +{ + if (prefix && *prefix) + 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); @@ -168,7 +177,7 @@ void yaz_log(int level, const char *fmt, ...) strcat(buf, "]"); } #else - sprintf(buf + strlen(buf), " [%s]", strerror(errno)); + sprintf(buf + strlen(buf), " [%s]", strerror(yaz_errno())); #endif } if (start_hook_func) @@ -176,7 +185,8 @@ void yaz_log(int level, const char *fmt, ...) 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); + 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);