X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=e778932148ccaa87740ec460558e43498a59c6f0;hb=86ed958b7fd25d668f426da532a2a5c0a78bc9ef;hp=6b41af39f1b083b28f93d10708797f78eeb54fff;hpb=cdf2ebfab56b50232a49bc4032d90704794ca4c0;p=yaz-moved-to-github.git diff --git a/include/yaz/log.h b/include/yaz/log.h index 6b41af3..e778932 100644 --- a/include/yaz/log.h +++ b/include/yaz/log.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2002, Index Data. + * Copyright (c) 1995-2003, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -23,7 +23,12 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: log.h,v 1.7 2002-08-29 09:58:42 adam Exp $ + * $Id: log.h,v 1.15 2004-11-02 12:55:04 heikki Exp $ + */ + +/** + * \file log.h + * \brief Header for logging utility */ #ifndef LOG_H @@ -35,16 +40,20 @@ YAZ_BEGIN_CDECL -#define LOG_FATAL 0x0001 -#define LOG_DEBUG 0x0002 -#define LOG_WARN 0x0004 -#define LOG_LOG 0x0008 -#define LOG_ERRNO 0x0010 /* append strerror to message */ -#define LOG_FILE 0x0020 -#define LOG_APP 0x0040 /* For application level events such as new-connection */ -#define LOG_MALLOC 0x0080 /* debugging mallocs */ +#define LOG_FATAL 0x00000001 +#define LOG_DEBUG 0x00000002 +#define LOG_WARN 0x00000004 +#define LOG_LOG 0x00000008 +#define LOG_ERRNO 0x00000010 /* append strerror to message */ +#define LOG_FILE 0x00000020 +#define LOG_APP 0x00000040 /* Application level events (new-connection) */ +#define LOG_MALLOC 0x00000080 /* debugging mallocs */ +#define LOG_NOTIME 0x00000100 /* do not output date and time */ +#define LOG_APP2 0x00000200 /* Application-level events, such as api calls */ +#define LOG_APP3 0x00000400 /* For more application-level events */ +#define LOG_FLUSH 0x00000800 /* Flush log after every write (DEBUG does too) */ -#define LOG_ALL 0xff7f +#define LOG_ALL (0xffff&~LOG_MALLOC&~LOG_NOTIME) #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN) @@ -55,6 +64,14 @@ YAZ_EXPORT void yaz_log_init_file (const char *fname); YAZ_EXPORT void yaz_log_init_level (int level); YAZ_EXPORT void yaz_log_init_prefix (const char *prefix); YAZ_EXPORT void yaz_log_init_prefix2 (const char *prefix); +/** + * yaz_log_time_format sets the format of the timestamp. See man 3 strftime + * Calling with "old" sets to the old format "11:55:06-02/11" + * Calling with NULL or "" sets to the new format "20041102-115719" + * If not called at all, the old format is used, for backward compatibility + * + * */ +YAZ_EXPORT void yaz_log_time_format(const char *fmt); YAZ_EXPORT void yaz_log(int level, const char *fmt, ...) #ifdef __GNUC__ @@ -70,6 +87,7 @@ YAZ_EXPORT void log_event_start (void (*func)(int level, const char *msg, void * YAZ_EXPORT void log_event_end (void (*func)(int level, const char *msg, void *info), void *info); +YAZ_EXPORT void yaz_log_reopen(void); YAZ_END_CDECL #endif