[syslog-ng]log rotation feature - patch

Fri, 1 Feb 2002 14:30:15 +0100

--=_mixed 004A75D7C1256B53_=
Content-Type: text/plain; charset="us-ascii"

Gentlemen,

As stated last friday, 
I'd like enhance syslog-ng with some features in order to get rid of some 
log rotation scripts:

"For some of our systems, we log to a centralised system, but also store 
the logs locally.
These local logs only need limited availability, say a week or so.
The file() destination currently is already able to use the target 
$WEEKDAYS,
but in that case, logs from both Jan 17 and Jan 24 are logged in 
messages.Thu.log
Therefore, I'd like to add a new option   remove_if_older(X)    which 
removes a logfile 
with a timestamp older than X days prior to writing the new message to 
that file.
(default should be 0 (=never), which means that for a disabled feauture 
only one C 'if' statement additional overhead is caused)"

I've finished implementing the above feature, which is attached as a 
patch.
I patched against 1.4.14, the latest stable version, and it probably will 
work for the unstable tree, too.
The patch compiles and is verified to work for SuSE Linux 6.4 (Linux 
2.2.19 kernel, gcc 2.95.2, libc 2.1.3 ).

I hope everybody thinks it's a nice feature and that this patch is soon 
added to a new stable syslog-ng release...
(Please, Balazs???)

Groetjes,

Klaas van Gend

--=_mixed 004A75D7C1256B53_=
Content-Type: application/octet-stream; name="patch_remove_if_older.diff"
Content-Disposition: attachment; filename="patch_remove_if_older.diff"
Content-Transfer-Encoding: base64

ZGlmZiAtTnVydyBzeXNsb2ctbmctMS40LjE0L2RvYy9zZ21sL3N5c2xvZy1uZy5zZ21sIHN5c2xv
Zy1uZy0xLjQuMTQua3ZnL2RvYy9zZ21sL3N5c2xvZy1uZy5zZ21sCi0tLSBzeXNsb2ctbmctMS40
LjE0L2RvYy9zZ21sL3N5c2xvZy1uZy5zZ21sCU1vbiBOb3YgIDYgMTA6MzA6NTggMjAwMAorKysg
c3lzbG9nLW5nLTEuNC4xNC5rdmcvZG9jL3NnbWwvc3lzbG9nLW5nLnNnbWwJRnJpIEZlYiAgMSAx
MDowOTo1MSAyMDAyCkBAIC04ODUsNiArODg1LDEyIEBACiAJCTwvZW50cnk+CiAJICAgICAgPC9y
b3c+CiAJICAgICAgPHJvdz4KKwkJPGVudHJ5PldFRUtEQVk8L2VudHJ5PgorCQk8ZW50cnk+CisJ
CSAgVGhlIDMtbGV0dGVyIG5hbWUgb2YgdGhlIGRheSBvZiB3ZWVrIHRoZSBtZXNzYWdlIHdhcyBz
ZW50LCBlLmcuICdUaHUnLgorCQk8L2VudHJ5PgorCSAgICAgIDwvcm93PgorCSAgICAgIDxyb3c+
CiAJCTxlbnRyeT5IT1VSPC9lbnRyeT4KIAkJPGVudHJ5PgogCQkgIFRoZSBob3VyIG9mIGRheSB0
aGUgbWVzc2FnZSB3YXMgc2VudC4KQEAgLTEwMjIsNiArMTAyOCwyMyBAQAogCQkgIG5vCiAJCTwv
ZW50cnk+CiAJICAgICAgPC9yb3c+CisKKwkgICAgICA8cm93PgorCQk8ZW50cnk+cmVtb3ZlX2lm
X29sZGVyKCk8L2VudHJ5PiAKKwkJPGVudHJ5Pm51bWJlcjwvZW50cnk+CisJCTxlbnRyeT4KKwkJ
ICBJZiBzZXQgdG8gYSB2YWx1ZSBoaWdoZXIgdGhhbiAwLCBiZWZvcmUgd3JpdGluZyB0byBhIGZp
bGUsIHN5c2xvZy1uZworCQkgIGNoZWNrcyB3aGV0aGVyIHRoaXMgZmlsZSBpcyBvbGRlciB0aGFu
IHRoZSBzcGVjaWZpZWQgYW1vdW50IG9mIGRheXMuCisJCSAgSWYgc28sIGl0IHJlbW92ZXMgdGhl
IGV4aXN0aW5nIGZpbGUgYW5kIHRoZSBsaW5lIHRvIGJlIHdyaXR0ZW4gaXMgdGhlCisJCSAgZmly
c3QgbGluZSBpbiBhIG5ldyBmaWxlIHdpdGggdGhlIHNhbWUgbmFtZS4KKwkJICBJbiBjb21iaW5h
dGlvbiB3aXRoIGUuZy4gdGhlICRXRUVLREFZUyBtYWNybywgdGhpcyBpcyBjYW4gYmUgdXNlZAor
CQkgIGZvciBzaW1wbGUgbG9nIHJvdGF0aW9uLCBpbiBjYXNlIG5vdCBhbGwgaGlzdG9yeSBuZWVk
IHRvIGJlIGtlcHQuCisJCTwvZW50cnk+CisJCTxlbnRyeT4KKwkJICBEbyBuZXZlciByZW1vdmUg
ZXhpc3RpbmcgZmlsZXMsIGJ1dCBhcHBlbmQgKCA9IDApLgorCQk8L2VudHJ5PgorCSAgICAgIDwv
cm93PgorCiAJICAgIDwvdGJvZHk+CiAJICA8L3Rncm91cD4KIAk8L3RhYmxlPgpkaWZmIC1OdXJ3
IHN5c2xvZy1uZy0xLjQuMTQvc3JjL2FmZmlsZS5jIHN5c2xvZy1uZy0xLjQuMTQua3ZnL3NyYy9h
ZmZpbGUuYwotLS0gc3lzbG9nLW5nLTEuNC4xNC9zcmMvYWZmaWxlLmMJV2VkIEp1bCAxMSAxNjow
ODoxNiAyMDAxCisrKyBzeXNsb2ctbmctMS40LjE0Lmt2Zy9zcmMvYWZmaWxlLmMJRnJpIEZlYiAg
MSAwOTo1NjozMCAyMDAyCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSA8Z3JwLmg+CiAjaW5j
bHVkZSA8dW5pc3RkLmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KKyNpbmNsdWRlIDx0aW1lLmg+CiAj
aW5jbHVkZSAic3lzbG9nLW5hbWVzLmgiCiAKICNpbmNsdWRlICJhZmZpbGUuYy54IgpAQCAtMjAx
LDcgKzIwMiwyMCBAQAogICAJaWYgKHNlbGYtPm93bmVyLT5mbGFncyAmIEFGRklMRV9QSVBFKQog
ICAJCWZsYWdzID0gT19SRFdSIHwgT19OT0NUVFkgfCBPX05PTkJMT0NLOwogICAJZWxzZQotCSAg
CWZsYWdzID0gT19XUk9OTFkgfCBPX0NSRUFUIHwgT19BUFBFTkQgfE9fTk9DVFRZIHwgT19OT05C
TE9DSzsKKyAgICAgICAgCWZsYWdzID0gT19XUk9OTFkgfCBPX0FQUEVORCB8IE9fQ1JFQVQgfCBP
X05PQ1RUWSB8IE9fTk9OQkxPQ0s7CisKKwlpZiAoc2VsZi0+b3duZXItPnJlbW92ZV9pZl9vbGRl
ciA+IDApIHsKKyAgICAgICAgCS8qIHJlbW92ZSAoPXVubGluaykgaWYgZmlsZSBpcyBtb3JlIHRo
YW4gWFhYIGRheXMgb2xkICovCisgICAgICAgIAlzdHJ1Y3Qgc3RhdCAgbXlzdGF0OworICAgICAg
ICAJdGltZV90ICBteWN1cnJlbnR0aW1lID0gdGltZShOVUxMKTsKKyAgICAgICAgCWlmIChzdGF0
KHNlbGYtPmV4cGFuZGVkX2ZuYW1lLT5kYXRhLCAmbXlzdGF0KSA9PSAwKSB7CisgICAgICAgICAg
ICAgICAgCWlmICgobXljdXJyZW50dGltZS1teXN0YXQuc3RfbXRpbWUpID49CisgICAgICAgICAg
ICAgICAgICAgIAkoMjQqNjAqNjAqKHNlbGYtPm93bmVyLT5yZW1vdmVfaWZfb2xkZXIpKSkgewor
ICAgICAgICAgICAgICAgICAgICAgICAgCXVubGluayhzZWxmLT5leHBhbmRlZF9mbmFtZS0+ZGF0
YSk7CisgICAgICAgICAgICAgICAgCX0KKyAgICAgICAgCX0KKwl9CisKIAlpZiAoZG9fb3Blbl9m
aWxlKHNlbGYtPmV4cGFuZGVkX2ZuYW1lLCBmbGFncywgCiAJICAgICAgICAgICAgICAgICBzZWxm
LT5vd25lci0+dWlkLCBzZWxmLT5vd25lci0+Z2lkLCBzZWxmLT5vd25lci0+cGVybSwgCiAJICAg
ICAgICAgICAgICAgICBzZWxmLT5vd25lci0+ZGlyX3VpZCwgc2VsZi0+b3duZXItPmRpcl9naWQs
IHNlbGYtPm93bmVyLT5kaXJfcGVybSwKQEAgLTI2NCw2ICsyNzgsNyBAQAogCSAoZGlyX2dpZCAu
IGludCkKIAkgKGRpcl9wZXJtIC4gaW50KQogICAgICAgICAgKGZsYWdzIHNpbXBsZSBpbnQpCisg
ICAgICAgICAocmVtb3ZlX2lmX29sZGVyIC4gaW50KQogCSAoc3luY19mcmVxIHNpbXBsZSBVSU5U
MzIpCiAJICh0ZW1wbGF0ZV9mbmFtZSBzdHJpbmcpCiAJICh3cml0ZXJzIG9iamVjdCBhZmZpbGVf
ZGVzdF93cml0ZXIpCkBAIC0zNjMsNiArMzc4LDE3IEBACiAJc2VsZi0+ZmxhZ3MgPSBzZXRfZmxh
Z3Moc2VsZi0+ZmxhZ3MsIEFGRklMRV9DUkVBVEVfRElSUywgQUZGSUxFX0NSRUFURV9ESVJTX1NI
SUZULCBlbmFibGUpOwogfQogCit2b2lkIGFmZmlsZV9zZXRfcmVtb3ZlX2lmX29sZGVyKHN0cnVj
dCBsb2dfZGVzdF9kcml2ZXIgKmMsIGludCBkYXlzKQoreworCUNBU1QoYWZmaWxlX2Rlc3QsIHNl
bGYsIGMpOworCisJaWYgKGRheXMgPCAwKSB7CisJCXdlcnJvcigiV2FybmluZzogdGhlIGRheXMg
YmVmb3JlIHJlbW92YWwgcGFyYW1ldGVyIGlzIG5lZ2F0aXZlLCBkaXNhYmxlcyBvcHRpb25cbiIp
OworCQlkYXlzID0gLTE7CisJfQorCXNlbGYtPnJlbW92ZV9pZl9vbGRlciA9IGRheXM7Cit9CisK
ICNkZWZpbmUgTUFYX01BQ1JPX0FSR1MgICAgICAgIDMyCiAjZGVmaW5lIE1BWF9FWFBBTkRFRF9N
QUNSTyAgICAxMDI0CiAKQEAgLTYyNSw2ICs2NTEsNyBAQAogCXNlbGYtPnBlcm0gPSAtMTsKIAlz
ZWxmLT5kaXJfdWlkID0gc2VsZi0+ZGlyX2dpZCA9IC0xOwogCXNlbGYtPmRpcl9wZXJtID0gLTE7
CisJc2VsZi0+cmVtb3ZlX2lmX29sZGVyID0gLTE7CiAJc2VsZi0+dGVtcGxhdGVfZm5hbWUgPSBj
X2Zvcm1hdF9jc3RyaW5nKCIleiIsIG5hbWUpOwogCWlmIChzdHJjaHIobmFtZSwgJyQnKSA9PSBO
VUxMKQogCQlmbGFncyB8PSBBRkZJTEVfTk9fRVhQQU5EOwpkaWZmIC1OdXJ3IHN5c2xvZy1uZy0x
LjQuMTQvc3JjL2FmZmlsZS5jLnggc3lzbG9nLW5nLTEuNC4xNC5rdmcvc3JjL2FmZmlsZS5jLngK
LS0tIHN5c2xvZy1uZy0xLjQuMTQvc3JjL2FmZmlsZS5jLngJV2VkIEp1bCAxMSAxNjowODozNyAy
MDAxCisrKyBzeXNsb2ctbmctMS40LjE0Lmt2Zy9zcmMvYWZmaWxlLmMueAlGcmkgRmViICAxIDEw
OjAwOjAzIDIwMDIKQEAgLTEwOSw2ICsxMDksNyBAQAogICBpbnQgZGlyX3VpZDsKICAgaW50IGRp
cl9naWQ7CiAgIGludCBkaXJfcGVybTsKKyAgaW50IHJlbW92ZV9pZl9vbGRlcjsKICAgaW50IGZs
YWdzOwogICBVSU5UMzIgc3luY19mcmVxOwogICBzdHJ1Y3Qgb2xfc3RyaW5nICp0ZW1wbGF0ZV9m
bmFtZTsKZGlmZiAtTnVydyBzeXNsb2ctbmctMS40LjE0L3NyYy9hZmZpbGUuaCBzeXNsb2ctbmct
MS40LjE0Lmt2Zy9zcmMvYWZmaWxlLmgKLS0tIHN5c2xvZy1uZy0xLjQuMTQvc3JjL2FmZmlsZS5o
CVN1biBGZWIgMjUgMTM6MzA6MjIgMjAwMQorKysgc3lzbG9nLW5nLTEuNC4xNC5rdmcvc3JjL2Fm
ZmlsZS5oCUZyaSBGZWIgIDEgMDA6NTA6MzcgMjAwMgpAQCAtNTUsNiArNTUsNyBAQAogdm9pZCBh
ZmZpbGVfc2V0X2Rpcl9ncm91cChzdHJ1Y3QgbG9nX2Rlc3RfZHJpdmVyICpjLCBjaGFyICpncm91
cCk7CiB2b2lkIGFmZmlsZV9zZXRfZGlyX3Blcm0oc3RydWN0IGxvZ19kZXN0X2RyaXZlciAqYywg
aW50IHBlcm0pOwogdm9pZCBhZmZpbGVfc2V0X2NyZWF0ZV9kaXJzKHN0cnVjdCBsb2dfZGVzdF9k
cml2ZXIgKmMsIGludCBlbmFibGUpOwordm9pZCBhZmZpbGVfc2V0X3JlbW92ZV9pZl9vbGRlcihz
dHJ1Y3QgbG9nX2Rlc3RfZHJpdmVyICpjLCBpbnQgZGF5cyk7CiAKIHN0cnVjdCBsb2dfc291cmNl
X2RyaXZlciAqbWFrZV9hZmZpbGVfc291cmNlKGNvbnN0IGNoYXIgKm5hbWUsIGludCBmbGFncyk7
CiBzdHJ1Y3QgbG9nX2Rlc3RfZHJpdmVyICptYWtlX2FmZmlsZV9kZXN0KGNvbnN0IGNoYXIgKm5h
bWUsIGludCBmbGFncyk7CmRpZmYgLU51cncgc3lzbG9nLW5nLTEuNC4xNC9zcmMvY2ZnLWdyYW1t
YXIueSBzeXNsb2ctbmctMS40LjE0Lmt2Zy9zcmMvY2ZnLWdyYW1tYXIueQotLS0gc3lzbG9nLW5n
LTEuNC4xNC9zcmMvY2ZnLWdyYW1tYXIueQlTdW4gRmViIDI1IDEzOjMwOjIyIDIwMDEKKysrIHN5
c2xvZy1uZy0xLjQuMTQua3ZnL3NyYy9jZmctZ3JhbW1hci55CUZyaSBGZWIgIDEgMDA6NTA6Mzcg
MjAwMgpAQCAtNzEsNiArNzEsNyBAQAogJXRva2VuIEtXX09XTkVSIEtXX0dST1VQIEtXX1BFUk0g
S1dfS0VFUF9BTElWRSBLV19NQVhfQ09OTkVDVElPTlMKICV0b2tlbiBLV19MT0NBTElQIEtXX0lQ
IEtXX0xPQ0FMUE9SVCBLV19QT1JUIEtXX0RFU1RQT1JUIAogJXRva2VuIEtXX0NPTVBSRVNTIEtX
X01BQyBLV19BVVRIIEtXX0VOQ1JZUFQKKyV0b2tlbiBLV19SRU1PVkVfSUZfT0xERVIKIAogLyog
ZmlsdGVyIGl0ZW1zKi8KICV0b2tlbiBLV19GQUNJTElUWSBLV19MRVZFTCBLV19QUk9HUkFNIEtX
X0hPU1QgS1dfTUFUQ0gKQEAgLTM2MSw2ICszNjIsNyBAQAogCXwgS1dfRElSX0dST1VQICcoJyBz
dHJpbmcgJyknCQl7IGFmZmlsZV9zZXRfZGlyX2dyb3VwKGxhc3RfZGVzdF9kcml2ZXIsICQzKTsg
ZnJlZSgkMyk7IH0KIAl8IEtXX0RJUl9QRVJNICcoJyBOVU1CRVIgJyknCQl7IGFmZmlsZV9zZXRf
ZGlyX3Blcm0obGFzdF9kZXN0X2RyaXZlciwgJDMpOyB9CiAJfCBLV19DUkVBVEVfRElSUyAnKCcg
eWVzbm8gJyknCQl7IGFmZmlsZV9zZXRfY3JlYXRlX2RpcnMobGFzdF9kZXN0X2RyaXZlciwgJDMp
OyB9CisJfCBLV19SRU1PVkVfSUZfT0xERVIgJygnIE5VTUJFUiAnKScJeyBhZmZpbGVfc2V0X3Jl
bW92ZV9pZl9vbGRlcihsYXN0X2Rlc3RfZHJpdmVyLCAkMyk7IH0KIAk7CiAKIGRlc3RfYWZwaXBl
CmRpZmYgLU51cncgc3lzbG9nLW5nLTEuNC4xNC9zcmMvY2ZnLWxleC5sIHN5c2xvZy1uZy0xLjQu
MTQua3ZnL3NyYy9jZmctbGV4LmwKLS0tIHN5c2xvZy1uZy0xLjQuMTQvc3JjL2NmZy1sZXgubAlT
dW4gRmViIDI1IDEzOjMwOjIyIDIwMDEKKysrIHN5c2xvZy1uZy0xLjQuMTQua3ZnL3NyYy9jZmct
bGV4LmwJRnJpIEZlYiAgMSAwMDo1MDozNyAyMDAyCkBAIC04Myw2ICs4Myw3IEBACiAJeyAiYWxs
b3ciLAkJS1dfQUxMT1cgfSwKIAl7ICJkZW55IiwJCUtXX0RFTlkgfSwKIAl7ICJjb21wcmVzcyIs
CQlLV19DT01QUkVTUyB9LAorCXsgInJlbW92ZV9pZl9vbGRlciIsCUtXX1JFTU9WRV9JRl9PTERF
UiB9LAogICAgICAgIAogCS8qIHNvdXJjZSBvciBkZXN0aW5hdGlvbiBpdGVtcyAqLwogCXsgImZp
bGUiLAkJS1dfRklMRSB9LAo=
--=_mixed 004A75D7C1256B53_=--