diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 14:59:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 14:59:09 +0200 |
| commit | ea4625e8a43c7952af2bf936e5dd18db5e8ab9a2 (patch) | |
| tree | 217aacd5cdb5761c627b6bf2909dca82200a64fd | |
| parent | 908586ce956e6ccb576f48cd1c46ff5655e92479 (diff) | |
| parent | 5a25a441b44f2125ed709ed95e07dab9b56327d0 (diff) | |
| download | rsyslog-ea4625e8a43c7952af2bf936e5dd18db5e8ab9a2.tar.gz rsyslog-ea4625e8a43c7952af2bf936e5dd18db5e8ab9a2.tar.bz2 rsyslog-ea4625e8a43c7952af2bf936e5dd18db5e8ab9a2.zip | |
Merge branch 'v5-stable' into tmp
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/stream.c | 2 | ||||
| -rw-r--r-- | runtime/stream.h | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -703,6 +703,9 @@ expected that interfaces, even new ones, break during the initial [ported from v4] --------------------------------------------------------------------------- Version 5.10.2 [V5-STABLE], 201?-??-?? +- bugfix: queue file size was not correctly processed + this could lead to using one queue file per message for sizes >2GB + Thanks to Tomas Heinrich for the patch. - updated systemd files to match current systemd source - bugfix: spurios error messages from imuxsock about (non-error) EAGAIN Thanks to Marius Tomaschewski for the patch. diff --git a/runtime/stream.c b/runtime/stream.c index 742799d2..3eb7708d 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -1427,7 +1427,7 @@ finalize_it: /* property set methods */ /* simple ones first */ DEFpropSetMeth(strm, bDeleteOnClose, int) -DEFpropSetMeth(strm, iMaxFileSize, int) +DEFpropSetMeth(strm, iMaxFileSize, int64) DEFpropSetMeth(strm, iFileNumDigits, int) DEFpropSetMeth(strm, tOperationsMode, int) DEFpropSetMeth(strm, tOpenMode, mode_t) diff --git a/runtime/stream.h b/runtime/stream.h index a01929f2..0828f6fd 100644 --- a/runtime/stream.h +++ b/runtime/stream.h @@ -149,7 +149,6 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */ rsRetVal (*Construct)(strm_t **ppThis); rsRetVal (*ConstructFinalize)(strm_t *pThis); rsRetVal (*Destruct)(strm_t **ppThis); - rsRetVal (*SetMaxFileSize)(strm_t *pThis, int64 iMaxFileSize); rsRetVal (*SetFileName)(strm_t *pThis, uchar *pszName, size_t iLenName); rsRetVal (*ReadChar)(strm_t *pThis, uchar *pC); rsRetVal (*UnreadChar)(strm_t *pThis, uchar c); @@ -167,7 +166,7 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */ rsRetVal (*SetWCntr)(strm_t *pThis, number_t *pWCnt); rsRetVal (*Dup)(strm_t *pThis, strm_t **ppNew); INTERFACEpropSetMeth(strm, bDeleteOnClose, int); - INTERFACEpropSetMeth(strm, iMaxFileSize, int); + INTERFACEpropSetMeth(strm, iMaxFileSize, int64); INTERFACEpropSetMeth(strm, iMaxFiles, int); INTERFACEpropSetMeth(strm, iFileNumDigits, int); INTERFACEpropSetMeth(strm, tOperationsMode, int); |