From: Heikki Levanto <heikki@indexdata.dk>
Date: Wed, 12 Feb 2003 14:17:50 +0000 (+0000)
Subject: Added a LOG_NOTIME flag to disable time stamping log entries
X-Git-Tag: YAZ.2.0~50
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=06670a04cc9789bc938174a5e99ddaff97386867;p=yaz-moved-to-github.git

Added a LOG_NOTIME flag to disable time stamping log entries
(useful for regressions, can run a diff on logs)
---

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 6925d78..2499d0a 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.8 2003-01-06 08:20:27 adam Exp $
+ * $Id: log.h,v 1.9 2003-02-12 14:17:50 heikki Exp $
  */
 
 #ifndef LOG_H
@@ -43,8 +43,9 @@ YAZ_BEGIN_CDECL
 #define LOG_FILE   0x0020
 #define LOG_APP    0x0040     /* For application level events such as new-connection */
 #define LOG_MALLOC 0x0080     /* debugging mallocs */
+#define LOG_NOTIME 0x0100     /* do not output date and time */
 
-#define LOG_ALL   0xff7f
+#define LOG_ALL   (0xffff&~LOG_MALLOC&~LOG_NOTIME)
 
 #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
 
diff --git a/util/log.c b/util/log.c
index 9fe712e..cfcbf77 100644
--- a/util/log.c
+++ b/util/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.35 2003-02-11 16:35:17 heikki Exp $
+ * $Id: log.c,v 1.36 2003-02-12 14:17:50 heikki Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -53,6 +53,7 @@ static struct {
     { LOG_ERRNO, ""},
     { LOG_MALLOC, "malloc"},
     { LOG_APP,   "app"  },
+    { LOG_NOTIME, "" },
  /*   { LOG_ALL,   "all"  }, */
     { 0,         "none" },
     { 0, NULL }
@@ -135,7 +136,7 @@ void yaz_log(int level, const char *fmt, ...)
     int i;
     time_t ti;
     struct tm *tim;
-    char tbuf[50];
+    char tbuf[50]="";
     int o_level = level;
 
     if (!(level & l_level))
@@ -164,17 +165,20 @@ void yaz_log(int level, const char *fmt, ...)
 /* WIN32 */
     if (o_level & LOG_ERRNO)
     {
-	strcat(buf, " [");
-	yaz_strerror(buf+strlen(buf), 2048);
-	strcat(buf, "]");
+        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%s\n", tbuf, l_prefix, flags,
+    if (l_level & LOG_NOTIME)
+      tbuf[0]='\0';
+    else
+      strftime(tbuf, 50, "%H:%M:%S-%d/%m: ", tim);
+    fprintf(l_file, "%s%s%s %s%s\n", tbuf, l_prefix, flags,
             l_prefix2, buf);
     fflush(l_file);
     if (end_hook_func)