/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: log.c,v $
- * Revision 1.24 2000-09-04 08:58:15 adam
- * Added prefix yaz_ for most logging utility functions.
- *
- * Revision 1.23 2000/03/14 09:06:11 adam
- * Added POSIX threads support for frontend server.
- *
- * Revision 1.22 2000/02/29 13:44:55 adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.21 2000/02/28 11:20:06 adam
- * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
- *
- * Revision 1.20 1999/11/30 13:47:12 adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.19 1999/08/27 09:40:32 adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.18 1998/10/28 10:27:00 adam
- * New functions log_init_file, log_init_level, log_init_prefix.
- *
- * Revision 1.17 1997/12/09 16:11:02 adam
- * Assume strerror is defined on Unixes as well. It's standard ANSI.
- *
- * Revision 1.16 1997/10/06 08:55:07 adam
- * Changed log_init so that previous (if any) is closed.
- *
- * Revision 1.15 1997/09/29 07:13:13 adam
- * Minor changes.
- *
- * Revision 1.14 1997/09/18 08:48:09 adam
- * Fixed minor bug that caused log_init to ignore filename.
- *
- * Revision 1.13 1997/09/01 08:54:13 adam
- * New windows NT/95 port using MSV5.0. Made prefix query handling
- * thread safe. The function options ignores empty arguments when met.
- *
- * 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.34 2003-02-07 14:39:00 heikki Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include <errno.h>
#include <time.h>
+#include <yaz/nmem.h>
#include <yaz/log.h>
#define HAS_STRERROR 1
static int l_level = LOG_DEFAULT_LEVEL;
static FILE *l_file = NULL;
-static char l_prefix[512] = "log";
+static char l_prefix[512] = "";
+static char l_prefix2[512] = "";
static struct {
int mask;
{ LOG_WARN, "warn" },
{ LOG_LOG, "log" },
{ LOG_ERRNO, ""},
+ { LOG_MALLOC, "malloc"},
{ LOG_ALL, "all" },
{ 0, "none" },
{ 0, NULL }
if (!l_file)
l_file = stderr;
if (!fname || !*fname)
- return;
- if (!(new_file = fopen(fname, "a")))
+ new_file=stderr;
+ else if (!(new_file = fopen(fname, "a")))
return;
if (l_file != stderr)
{
void yaz_log_init_prefix (const char *prefix)
{
if (prefix && *prefix)
- sprintf(l_prefix, "%.512s", prefix);
+ sprintf(l_prefix, "%.511s ", prefix);
+ else
+ *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);
yaz_log_init_prefix (prefix);
- yaz_log_init_file (fname);
+ if (fname && *fname)
+ yaz_log_init_file (fname);
}
static void (*start_hook_func)(int, const char *, void *) = NULL;
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);
+ 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);
projects / yaz-moved-to-github.git / blobdiff