X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=2485705d08a8b3a836c196997a2a503912b84867;hp=6c203abb49cb15dcd137790b0fff0017841b7412;hb=4c176312acdc3444c9afc820f76a393e64668e52;hpb=e958092d7a7b66ff71cb05434b900d871e1f30fa

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 6c203ab..2485705 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  *
  * 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,12 +23,12 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.19 2004-11-16 17:08:11 heikki Exp $
+ * $Id: log.h,v 1.32 2005-01-15 19:47:09 adam Exp $
  */
 
 /**
  * \file log.h
- * \brief Header for logging utility
+ * \brief The old, deprecated header for log.c
  */
 
 #ifndef LOG_H
@@ -36,33 +36,37 @@
 
 #include <stdio.h>
 #include <yaz/yconfig.h>
-#include <yaz/xmalloc.h>
 
 YAZ_BEGIN_CDECL
 
-#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_LOGLVL 0x00001000 /* log when modules query log levels */
+#define YLOG_FATAL  0x00000001
+#define YLOG_DEBUG  0x00000002
+#define YLOG_WARN   0x00000004
+#define YLOG_LOG    0x00000008
+#define YLOG_ERRNO  0x00000010 /* append strerror to message */
+/*#define YLOG_FILE   0x00000020 */
+/*#define YLOG_APP    0x00000040 */ 
+   /* Application level events (new-connection) */
+#define YLOG_MALLOC 0x00000080 /* debugging mallocs */
+#define YLOG_NOTIME 0x00000100 /* do not output date and time */
+/* #define YLOG_APP2   0x00000200 */
+   /* Application-level events, such as api calls */
+/* #define YLOG_APP3   0x00000400 */
+   /* For more application-level events */
+#define YLOG_FLUSH  0x00000800 /* Flush log after every write (DEBUG does too) */
+#define YLOG_LOGLVL 0x00001000 /* log when modules query log levels */
                               /* this has to be a hard-coded bit, not to loop*/
 
-#define LOG_ALL   (0xffff&~LOG_MALLOC&~LOG_NOTIME)
+#define YLOG_ALL   (0xffff&~YLOG_MALLOC&~YLOG_NOTIME)
 
-#define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
+#define YLOG_DEFAULT_LEVEL \
+    (YLOG_FATAL | YLOG_ERRNO | YLOG_LOG | YLOG_WARN | YLOG_FLUSH)
+/* not having flush here confuses Solaris users, who won't see any logs until
+ * (and if) the program exits normally */
 
-#define LOG_LAST_BIT LOG_LOGLVL /* the last bit used for regular log bits */
+#define YLOG_LAST_BIT YLOG_LOGLVL /* the last bit used for regular log bits */
                                 /* the rest are for dynamic modules */
 
-#define logf yaz_log
 
 /** 
  * yaz_log_init is a shorthand for initializing the log level and prefixes */
@@ -108,7 +112,7 @@ YAZ_EXPORT void yaz_log(int level, const char *fmt, ...)
  * yaz_log_mask_str converts a comma-separated list of log levels to a bit 
  * mask. Starts from default level, and adds bits as specified, unless 'none'
  * is specified, which clears the list. If a name matches the name of a
- * LOG_BIT above, that one is set. Otherwise a new value is picked, and given
+ * YLOG_BIT above, that one is set. Otherwise a new value is picked, and given
  * to that name, to be found with yaz_log_module_level */
 YAZ_EXPORT int yaz_log_mask_str(const char *str);
 
@@ -133,6 +137,40 @@ YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg, void *inf
 	void *info);
 
 YAZ_EXPORT void yaz_log_reopen(void);
+
+#if YAZ_USE_NEW_LOG
+
+#else
+
+#include <yaz/xmalloc.h>
+
+/* The old LOG_ bit names are here for compatibility only. They may 
+ * conflict with bits defined in syslog.h, or other places. 'LOG'
+ * really is not such a good name. YLOG must be more unique
+ */
+#define LOG_FATAL  YLOG_FATAL
+#define LOG_DEBUG  YLOG_DEBUG
+#define LOG_WARN   YLOG_WARN
+#define LOG_LOG    YLOG_LOG /* Deprecated, use the modern dynamic log levels*/
+#define LOG_ERRNO  YLOG_ERRNO 
+#define LOG_FILE   0x00000020 /* Deprecated - no YLOG_ equivalent */
+#define LOG_APP    0x00000040 /* Deprecated - no YLOG_ equivalent */
+#define LOG_MALLOC YLOG_MALLOC /* deprecated */
+#define LOG_NOTIME YLOG_NOTIME /* do not output date and time */
+#define LOG_APP2   0x00000200 /* Deprecated - no YLOG_ equivalent */
+#define LOG_APP3   0x00000400 /* Deprecated - no YLOG_ equivalent */
+#define LOG_FLUSH  YLOG_FLUSH 
+
+#define LOG_ALL    YLOG_ALL
+
+#define LOG_DEFAULT_LEVEL YLOG_DEFAULT_LEVEL
+
+
+/* logf is deprecated, as it conflicts with a math function */
+#define logf yaz_log
+
+#endif /* if YAZ_USE_NEW_LOG */
+
 YAZ_END_CDECL
 
 #endif