107906 2005-10-02 09:04 0000 [PATCH] Logrotate-3.7.1 weekly rotation is not working 2005-10-15 15:10:36 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED Inclusion P2 normal --- 1 boriz@home.nl dang@gentoo.org boriz@home.nl 2005-10-02 09:04:00 0000 http://forums.gentoo.org/viewtopic-p-2769131.html The bug is lenghtily outlined there. Short version: Logrotate does not rotate weekly items correctly. I made a patch which applies cleanly against logrotate.3.7.1-r1. I made a revised ebuild which installed no problems on my system. I haven't tested the changes for correctness yet, as that requires some time. Here's the patch --- logrotate-3.7.1-old/logrotate.c 2004-10-19 23:41:24.000000000 +0200 +++ logrotate-3.7.1-new/logrotate.c 2005-10-02 17:29:22.380767321 +0200 @@ -424,12 +424,15 @@ int findNeedRotating(logInfo * log, int switch (log->criterium) { case ROT_WEEKLY: /* rotate if: - 1) the current weekday is before the weekday of the - last rotation + 1) the day of the week is the same as the day of the week of + the previous rotation but not the same day of the year + this will rotate it on the same day every week, but not + twice a day. 2) more then a week has passed since the last rotation */ - state->doRotate = ((now.tm_wday < state->lastRotated.tm_wday) || - ((mktime(&now) - mktime(&state->lastRotated)) > + state->doRotate = ((now.tm_wday == state->lastRotated.tm_wday && + now.tm_yday != state->lastRotated.tm_yday) || + ((mktime(&now) - mktime(&state->lastRotated)) > (7 * 24 * 3600))); break; case ROT_MONTHLY: boriz@home.nl 2005-10-02 09:05:48 0000 Created an attachment (id=69735) patch for the problem. Please review changes for correctness. boriz@home.nl 2005-10-09 00:24:30 0000 It works: -rw------- 1 root root 57996 Oct 9 09:19 messages -rw------- 1 root root 155760 Oct 9 00:10 messages.1.gz -rw------- 1 root root 197750 Oct 2 18:53 messages.2.gz logrotate -d shows this right now (9:20): rotating pattern: /var/log/messages weekly (52 rotations) empty log files are rotated, old logs are removed considering log /var/log/messages log does not need rotating dang@gentoo.org 2005-10-10 12:30:51 0000 Thanks. I'll add the patch hopefully tonight. dang@gentoo.org 2005-10-15 15:10:36 0000 fixed in 3.7.1-r2. Sorry for the delay. 69735 2005-10-02 09:05 0000 patch for the problem. logrotate-3.7.1-weekly.patch text/plain LS0tIGxvZ3JvdGF0ZS0zLjcuMS1vbGQvbG9ncm90YXRlLmMJMjAwNC0xMC0xOSAyMzo0MToyNC4w MDAwMDAwMDAgKzAyMDAKKysrIGxvZ3JvdGF0ZS0zLjcuMS1uZXcvbG9ncm90YXRlLmMJMjAwNS0x MC0wMiAxNzoyOToyMi4zODA3NjczMjEgKzAyMDAKQEAgLTQyNCwxMiArNDI0LDE1IEBAIGludCBm aW5kTmVlZFJvdGF0aW5nKGxvZ0luZm8gKiBsb2csIGludCAKICAgICAgICAgc3dpdGNoIChsb2ct PmNyaXRlcml1bSkgewogICAgICAgICAgIGNhc2UgUk9UX1dFRUtMWToKICAgICAgICAgICAgIC8q IHJvdGF0ZSBpZjoKLSAgICAgICAgICAgICAgICAgIDEpIHRoZSBjdXJyZW50IHdlZWtkYXkgaXMg YmVmb3JlIHRoZSB3ZWVrZGF5IG9mIHRoZQotICAgICAgICAgICAgICAgICAgICAgbGFzdCByb3Rh dGlvbgorICAgICAgICAgICAgICAgICAgMSkgdGhlIGRheSBvZiB0aGUgd2VlayBpcyB0aGUgc2Ft ZSBhcyB0aGUgZGF5IG9mIHRoZSB3ZWVrIG9mCisgICAgICAgICAgICAgICAgICAgICB0aGUgcHJl dmlvdXMgcm90YXRpb24gYnV0IG5vdCB0aGUgc2FtZSBkYXkgb2YgdGhlIHllYXIKKyAgICAgICAg ICAgICAgICAgICAgIHRoaXMgd2lsbCByb3RhdGUgaXQgb24gdGhlIHNhbWUgZGF5IGV2ZXJ5IHdl ZWssIGJ1dCBub3QKKyAgICAgICAgICAgICAgICAgICAgIHR3aWNlIGEgZGF5LgogICAgICAgICAg ICAgICAgICAgMikgbW9yZSB0aGVuIGEgd2VlayBoYXMgcGFzc2VkIHNpbmNlIHRoZSBsYXN0CiAg ICAgICAgICAgICAgICAgICAgICByb3RhdGlvbiAqLwotICAgICAgICAgICAgc3RhdGUtPmRvUm90 YXRlID0gKChub3cudG1fd2RheSA8IHN0YXRlLT5sYXN0Um90YXRlZC50bV93ZGF5KSB8fAotCQkJ ICAgICAgICgobWt0aW1lKCZub3cpIC0gbWt0aW1lKCZzdGF0ZS0+bGFzdFJvdGF0ZWQpKSA+Cisg ICAgICAgICAgICBzdGF0ZS0+ZG9Sb3RhdGUgPSAoKG5vdy50bV93ZGF5ID09IHN0YXRlLT5sYXN0 Um90YXRlZC50bV93ZGF5ICYmCisJCQkJbm93LnRtX3lkYXkgIT0gc3RhdGUtPmxhc3RSb3RhdGVk LnRtX3lkYXkpIHx8CisJCQkJKChta3RpbWUoJm5vdykgLSBta3RpbWUoJnN0YXRlLT5sYXN0Um90 YXRlZCkpID4KIAkJCQkoNyAqIDI0ICogMzYwMCkpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgIGNhc2UgUk9UX01PTlRITFk6Cg==