X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=916ce42a3817dd1609d97f38c6915a2462f1179b;hb=8862e24160fcdd1d99da8b8203e6d4fe942b91de;hp=e778932148ccaa87740ec460558e43498a59c6f0;hpb=86ed958b7fd25d668f426da532a2a5c0a78bc9ef;p=yaz-moved-to-github.git

diff --git a/include/yaz/log.h b/include/yaz/log.h
index e778932..916ce42 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (c) 1995-2004, 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,71 +23,55 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.15 2004-11-02 12:55:04 heikki Exp $
+ * $Id: log.h,v 1.26 2004-12-09 09:37:00 adam Exp $
  */
 
 /**
  * \file log.h
- * \brief Header for logging utility
+ * \brief The old, deprecated header for log.c
  */
 
 #ifndef LOG_H
 #define LOG_H
 
-#include <stdio.h>
-#include <yaz/yconfig.h>
-#include <yaz/xmalloc.h>
+#include <yaz/ylog.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) */
+#ifndef YAZ_USE_OLD_LOG
+/* #warning "use of log.h is deprecated, use ylog.h instead" */
+/* if this warning gets on your nerves, run configure like this:
+ * CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure
+ */
+#endif
 
-#define LOG_ALL   (0xffff&~LOG_MALLOC&~LOG_NOTIME)
+YAZ_BEGIN_CDECL
 
-#define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
+/* 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 - not in ylog.h at all*/
+#define LOG_APP    0x00000040 /* Deprecated - not in ylog.h at all*/
+#define LOG_MALLOC YLOG_MALLOC /* deprecated */
+#define LOG_NOTIME YLOG_NOTIME /* do not output date and time */
+#define LOG_APP2   0x00000200 /* Deprecated - not in ylog.h at all*/
+#define LOG_APP3   0x00000400 /* Deprecated - not in ylog.h at all*/
+#define LOG_FLUSH  YLOG_FLUSH 
+ /*     LOG_LOGLVL is a new one in ylog.h. So new that no log.h users should
+  *     use it */
 
-#define logf yaz_log
+#define LOG_ALL    YLOG_ALL
 
-YAZ_EXPORT void yaz_log_init(int level, const char *prefix, const char *name);
-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);
+#define LOG_DEFAULT_LEVEL YLOG_DEFAULT_LEVEL
 
-YAZ_EXPORT void yaz_log(int level, const char *fmt, ...)
-#ifdef __GNUC__
-	__attribute__ ((format (printf, 2, 3)))
-#endif
-	;
-YAZ_EXPORT int yaz_log_mask_str (const char *str);
-YAZ_EXPORT int yaz_log_mask_str_x (const char *str, int level);
-YAZ_EXPORT FILE *yaz_log_file(void);
 
-YAZ_EXPORT void log_event_start (void (*func)(int level, const char *msg, void *info),
-	void *info);
-YAZ_EXPORT void log_event_end (void (*func)(int level, const char *msg, void *info),
-	void *info);
+/* logf is deprecated, as it conflicts with a math function */
+#define logf yaz_log
 
-YAZ_EXPORT void yaz_log_reopen(void);
 YAZ_END_CDECL
 
 #endif