Not buffering the log file, unless LOG_FLUSH is set. Reopening if necessary

[yaz-moved-to-github.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 32e26d9..7339829 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.2 2004-10-15 00:19:00 adam Exp $
+ * $Id: log.c,v 1.6 2004-11-02 13:52:54 heikki Exp $
  */
 
 /**
@@ -41,12 +41,22 @@ char *strerror(int n)
 
 #endif
 
+
 static int l_level = LOG_DEFAULT_LEVEL;
 static FILE *l_file = NULL;
 static char l_prefix[512] = "";
 static char l_prefix2[512] = "";
 static char l_fname[512] = "";
 
+static char l_old_default_format[]="%H:%M:%S-%d/%m";
+static char l_new_default_format[]="%Y%m%d-%H%M%S";
+#define TIMEFORMAT_LEN 50
+static char l_custom_format[TIMEFORMAT_LEN]="";
+static char *l_actual_format=l_old_default_format;
+
+/** l_max_size tells when to rotate the log. Default to 1 GB */
+/* static int l_max_size=1024*1024*1024;  */
+
 static struct {
     int mask;
     char *name;
@@ -63,6 +73,7 @@ static struct {
     { LOG_APP2  , "app2" },
     { LOG_APP3  , "app3" },
     { LOG_ALL,   "all"  },
+    { LOG_FLUSH, "flush" },
     { 0,         "none" },
     { 0, NULL }
 };  
@@ -100,13 +111,19 @@ void yaz_log_reopen(void)
     {
         fclose (l_file);
     }
-    setvbuf(new_file, 0, _IONBF, 0);
+    if (l_level & LOG_FLUSH)
+        setvbuf(new_file, 0, _IONBF, 0);
     l_file = new_file;
 }
 
 void yaz_log_init_level (int level)
 {
-    l_level = level;
+    if ( (l_level & LOG_FLUSH) != (level & LOG_FLUSH) )
+    {
+        l_level = level;
+        yaz_log_reopen(); /* make sure we set buffering right */
+    } else
+        l_level = level;
 }
 
 void yaz_log_init_prefix (const char *prefix)
@@ -157,13 +174,20 @@ void yaz_log(int level, const char *fmt, ...)
     int i;
     time_t ti;
     struct tm *tim;
-    char tbuf[50]="";
+    char tbuf[TIMEFORMAT_LEN]="";
     int o_level = level;
+    /* int flen; */
 
     if (!(level & l_level))
        return;
     if (!l_file)
         l_file = stderr;
+    
+/*    
+    flen=ftell(l_file);
+    if (flen>l_max_size) 
+        rotate_log();
+*/
     *flags = '\0';
     for (i = 0; level && mask_names[i].name; i++)
        if (mask_names[i].mask & level)
@@ -198,14 +222,34 @@ void yaz_log(int level, const char *fmt, ...)
     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,
+      strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
+    tbuf[TIMEFORMAT_LEN-1]='\0';
+    fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags,
             l_prefix2, buf);
-    fflush(l_file);
+    if (l_level & (LOG_FLUSH|LOG_DEBUG) )
+        fflush(l_file);
     if (end_hook_func)
        (*end_hook_func)(o_level, buf, end_hook_info);
 }
 
+void yaz_log_time_format(const char *fmt)
+{
+    if ( !fmt || !*fmt) 
+    { /* no format, default to new */
+        l_actual_format = l_new_default_format;
+        return; 
+    }
+    if (0==strcmp(fmt,"old"))
+    { /* force the old format */
+        l_actual_format = l_old_default_format;
+        return; 
+    }
+    /* else use custom format */
+    strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1);
+    l_custom_format[TIMEFORMAT_LEN-1]='\0';
+    l_actual_format = l_custom_format;
+}
+
 int yaz_log_mask_str (const char *str)
 {
     return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL);