X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=2004846b2532fab7747ef0101840683a5d38de74;hb=f7a54be570c51522047f42daf147f7739c557065;hp=d4973f2106246af33501dd379b8d79448d07d4f7;hpb=0c76adcaa70c004d8eaab1842d286e4462ac6b11;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index d4973f2..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.38 2006-07-31 10:05:04 adam 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,18 +177,36 @@ 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
+    }
 }
 
 
@@ -253,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)