X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=2004846b2532fab7747ef0101840683a5d38de74;hb=4d377a28c907f9fee3f576f32d96020fb7a8436c;hp=5c41f07a2943f6b6457de16c43a22984983214ed;hpb=fc42e0dc251df1d80ffc4c9279478d64d8a7027c;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index 5c41f07..2004846 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.37 2006-07-06 13:10:31 heikki Exp $
+ * $Id: log.c,v 1.41 2006-10-04 07:42:13 adam Exp $
  */
 
 /**
@@ -26,6 +26,7 @@
 #include <pth.h>
 #endif
 
+#include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -55,7 +56,8 @@ char *strerror(int n)
 #endif
 
 
-static int default_log_level() {
+static int default_log_level(void)
+{
     char *env = getenv("YAZ_LOG");
     if (env != 0)
         return yaz_log_mask_str_x(env, YLOG_DEFAULT_LEVEL);
@@ -90,8 +92,10 @@ static char l_new_default_format[] = "%Y%m%d-%H%M%S";
 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 const int l_def_max_size = 1024*1024*1024;
+/** l_max_size tells when to rotate the log. Default is 1 GB 
+    This is almost the same as never, but it saves applications in the
+    case of 2 or 4 GB file size limits..
+ */
 static int l_max_size = 1024*1024*1024;
 
 #define MAX_MASK_NAMES 35   /* 32 bits plus a few combo names */
@@ -120,7 +124,7 @@ static struct {
 
 static unsigned int next_log_bit = YLOG_LAST_BIT<<1; /* first dynamic bit */
 
-static void init_mutex()
+static void init_mutex(void)
 {
     if (mutex_init_flag)
         return;
@@ -140,7 +144,7 @@ FILE *yaz_log_file(void)
     return f;
 }
 
-void yaz_log_close()
+void yaz_log_close(void)
 {
     if (yaz_file_type == use_file && yaz_global_log_file)
     {
@@ -173,30 +177,50 @@ void yaz_log_init_file(const char *fname)
 
 static void rotate_log(const char *cur_fname)
 {
-    char newname[512];
-    strncpy(newname, cur_fname, 509);
-    newname[509] = '\0'; /* make sure it is terminated */
-    strcat(newname, ".1");
+    int i;
 #ifdef WIN32
     /* windows can't rename a file if it is open */
     fclose(yaz_global_log_file);
     yaz_global_log_file = 0;
-    MoveFileEx(cur_fname, newname, MOVEFILE_REPLACE_EXISTING);
+#endif
+    for (i = 0; i<9; i++)
+    {
+        char fname_str[FILENAME_MAX];
+        struct stat stat_buf;
+
+        sprintf(fname_str, "%s.%d", cur_fname, i);
+        if (stat(fname_str, &stat_buf) != 0)
+            break;
+    }
+    for (; i >= 0; --i)
+    {
+        char fname_str[2][FILENAME_MAX];
+
+        if (i > 0)
+            sprintf(fname_str[0], "%s.%d", cur_fname, i-1);
+        else
+            sprintf(fname_str[0], "%s", cur_fname);
+        sprintf(fname_str[1], "%s.%d", cur_fname, i);
+#ifdef WIN32
+        MoveFileEx(fname_str[0], fname_str[1], MOVEFILE_REPLACE_EXISTING);
 #else
-    rename(cur_fname, newname);
+        rename(fname_str[0], fname_str[1]);
 #endif
+    }
 }
 
 
 void yaz_log_init_level(int level)
 {
     init_mutex();
-    if (l_level < 0) l_level = default_log_level();
+    if (l_level < 0) 
+        l_level = default_log_level();
     if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
     {
         l_level = level;
         yaz_log_reopen(); /* make sure we set buffering right */
-    } else
+    } 
+    else
         l_level = level;
     if (l_level  & YLOG_LOGLVL)
     {  /* dump the log level bits */
@@ -251,10 +275,10 @@ void yaz_log_init(int level, const char *prefix, const char *fname)
 
 void yaz_log_init_max_size(int mx)
 {
-    if (mx <0)
-        l_max_size = l_def_max_size;
-    else
+    if (mx > 0)
         l_max_size = mx;
+    else
+        l_max_size = 0;
 }
 
 void yaz_log_set_handler(void (*func)(int, const char *, void *), void *info)
@@ -324,7 +348,7 @@ static void yaz_log_do_reopen(const char *filemode)
 #else
     tm = localtime(&cur_time);
 #endif
-    yaz_log_open_check(tm, 1, filemode );
+    yaz_log_open_check(tm, 1, filemode);
     nmem_mutex_leave(log_mutex);
 }
 
@@ -368,10 +392,10 @@ static void yaz_strftime(char *dst, size_t sz,
         strftime(dst, sz, fmt, tm);
 }
                             
-static void yaz_log_to_file(int level, FILE *file, const char *buf)
+static void yaz_log_to_file(int level, const char *log_message)
 {
+    FILE *file;
     time_t ti = time(0);
-    int i;
 #if HAVE_LOCALTIME_R
     struct tm tm0, *tm = &tm0;
 #else
@@ -381,8 +405,8 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
     init_mutex();
 
     nmem_mutex_enter(log_mutex);
-
-    #if HAVE_LOCALTIME_R
+    
+#if HAVE_LOCALTIME_R
     localtime_r(&ti, tm);
 #else
     tm = localtime(&ti);
@@ -395,6 +419,7 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
     {
         char tbuf[TIMEFORMAT_LEN];
         char flags[1024];
+        int i;
         
         *flags = '\0';
         for (i = 0; level && mask_names[i].name; i++)
@@ -414,7 +439,8 @@ static void yaz_log_to_file(int level, FILE *file, const char *buf)
             yaz_strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tm);
         tbuf[TIMEFORMAT_LEN-1] = '\0';
         
-        fprintf(file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, buf);
+        fprintf(file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2,
+                log_message);
         if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
             fflush(file);
     }
@@ -457,7 +483,7 @@ void yaz_log(int level, const char *fmt, ...)
         (*hook_func)(o_level, buf, hook_info);
     file = yaz_log_file();
     if (file)
-        yaz_log_to_file(level, file, buf);
+        yaz_log_to_file(level, buf);
     if (end_hook_func)
         (*end_hook_func)(o_level, buf, end_hook_info);
 }