Changeset 492 for trunk

Timestamp:

Nov 1, 2015, 12:55:04 AM (9 years ago)

Author:

katerina

Message:

Fix for ticket #388 (logfile rotation).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_hash.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 4.1.1:
+        * fix problem with rotated logfiles when content is always constant,
+        i.e. checksum does not change (reported by Bond).
         * fix problem with baseline update on FreeBSD and probably other
         non-GNU/Linux systems (reported by L.Vasiliev)

trunk/src/sh_hash.c

@@ -1880 +1880 @@
   char * linkComp;
   int  maxcomp;
+  volatile int  checksum_flag = 0;
 
   char change_code[16];
@@ -1963 +1964 @@
        (theFile->check_flags & MODI_CHK) != 0)
     {
+      checksum_flag = 1;
+      
       if ((theFile->check_flags & MODI_SGROW) == 0)
         {
@@ -2053 +2056 @@
        (theFile->check_flags & MODI_INO) != 0)
     {
-      modi_mask |= MODI_INO;
-      change_code[3] = 'I';
-      TPT ((0, FIL__, __LINE__, _("mod=<inode>")));
+      if ((theFile->check_flags & MODI_SGROW) == 0)
+        {
+          modi_mask |= MODI_INO;
+          change_code[3] = 'I';
+          TPT ((0, FIL__, __LINE__, _("mod=<inode>")));
+        }
+      else
+        {
+          /* growing log, checksum ok but inode changed 
+           */
+          if (checksum_flag == 0)
+            {
+              if (S_FALSE == sh_check_rotated_log (theFile->fullpath, (UINT64) p->theFile.size, 
+                                                   (UINT64) p->theFile.ino, p->theFile.checksum,
+                                                   p->theFile.checkflags))
+                {
+                  modi_mask |= MODI_INO;
+                  change_code[3] = 'I';
+                  TPT ((0, FIL__, __LINE__, _("mod=<inode>")));
+                }
+              else
+                {
+                  /* logfile has been rotated */
+                  p->theFile.size  = theFile->size;
+                  p->theFile.ino   = theFile->ino;
+                  sl_strlcpy(p->theFile.checksum, fileHash, KEY_LEN+1);
+                }
+            }
+          else
+            {
+              modi_mask |= MODI_INO;
+              change_code[3] = 'I';
+              TPT ((0, FIL__, __LINE__, _("mod=<inode>")));
+            }
+        }
     }