value pairs bugfixes #110
value pairs bugfixes #110
Conversation
|
Unit tests have failed with this patch. Also can you pls give some rationale to the patch? What it fixes exactly? |
|
The rationale is that when using value-pairs() scopes, DATE was different between The other change is for the rfc5424 scope, which had (As far as I remember - we'll look at the test failures too, they went through internally...) |
|
Ah, yes, the first commit is to fix #105, for reference. |
Formerly it contained sometimes the stamp time and sometimes the received time. From now it will always contain the stamp time. Signed-off-by: Daniel Gados <gdani@balabit.hu>
Signed-off-by: Daniel Gados <gdani@balabit.hu>
|
The patches were picked from syslog-ng PE 5.1 development code where the syslog-format works slightly differently than in OSE (the sdata part is constructed differently) and the macro-set is different too, thus the newly written unit tests comparing the exact output and aiming to test the discovered new bugs failed to work in OSE. |
|
Regarding DATE, R_DATE S_DATE pls read the documentation about the deprecated use_time_recvd setting and 11.1.3 and make sure we are creating a consistent behavior. |
|
By the patches included in this pull request the meaning of the DATE the macro does not change, neither any of the prefixed DATE macros (ie. S_DATE, R_DATE, C_DATE) in accordance with the syslog-ng OSE 3.5 Administrator Guide section 11.1.3 and with the syslog-ng Premium Edition 5 LTS Administrator Guide section 13.1.3. The fixes' aim was to ensure that the value-pairs expand correctly and consistently. Formerly the value-pairs scope named rfc3164 contained the DATE macro with an alias to R_DATE resulting that syslog-ng expanded value-pairs differently using different scopes:
With one of the above mentioned patches using value-pairs this behaviour changes so that the DATE expands to the value of the DATE macro (the same as S_DATE) in all cases regardless which scope the user wishes to use. |
Formerly it was expaned only to nvtable entries, but from now it expands to macros as well without setting the scope. Signed-off-by: Daniel Gados <gdani@balabit.hu>
Signed-off-by: Daniel Gados <gdani@balabit.hu>
|
All right, then merging this is up to @algernon |
|
Took a bit of time to get back to these changes, but they all look good to me, so merge coming up! Thanks a lot for the fixes! |
No description provided.