summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'masterRainer Gerhards2012-10-192-4/+4
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
| | | |
* | | | doc: improve module docFlorian Riedl2012-10-191-26/+42
| | | |
* | | | prepare for 7.3.1 releaseRainer Gerhards2012-10-193-3/+3
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-192-7/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| | | | | | | | | | | | | | | | plus some cleanup
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
| |\| |
| | * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-185-63/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | preparing for 7.1.12 releaseRainer Gerhards2012-10-183-3/+5
| | | |
| * | | build: Remove vestiges of the cust1 pluginMichael Biebl2012-10-181-1/+0
| | | |
| * | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | |
| * | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-182-3/+2
| | | |
| * | | build: Use pkg-config to check for libcurlMichael Biebl2012-10-181-19/+1
| | | | | | | | | | | | | | | | curl has shipped that file since 2004.
| * | | build: Use pkg-config to check for libuuidMichael Biebl2012-10-181-16/+1
| | | | | | | | | | | | | | | | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009.
| * | | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULESMichael Biebl2012-10-181-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of pkg-config do that already. According to pkg-config upstream this change was made around 2005, so it should be rather safe. This change doesn't affect users building from dist tarballs anyway but only if you are building from a Git checkout.
| * | | doc: typo fixRainer Gerhards2012-10-171-1/+1
| | | |
* | | | doc: add recent optimization to ChangeLogRainer Gerhards2012-10-181-0/+2
| | | |
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-188-65/+160
|\ \ \ \
| * | | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | optimize property replacer: reduce runtime for simple processingRainer Gerhards2012-10-113-6/+23
| | | | |
| * | | | fix: wrong variable was populated in MsgGetProp()Rainer Gerhards2012-10-111-8/+8
| | | | | | | | | | | | | | | | | | | | problem in this morning's change, never released
| * | | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-10-115-7/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | | | slightly improve performance for $NOW family of system propertiesRainer Gerhards2012-10-111-17/+32
| | | | | |
| * | | | | do "template date call" only when actually neededRainer Gerhards2012-10-114-1/+56
| | | | | |
| * | | | | optimize: do "template time() call" only once per batchRainer Gerhards2012-10-103-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This still needs more optimizing as the call is very often NOT needed - but we need to know about the templates in that case.
| * | | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-105-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each.
* | | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-174-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on.
* | | | | | doc: update ChangeLog infoRainer Gerhards2012-10-171-1/+5
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-173-6/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
| | | | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-173-6/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
| | | | | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-173-5/+7
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | preparing for 5.10.1Rainer Gerhards2012-10-173-4/+4
| | | | | |
| | | * | | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | | |
| | | * | | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | | |
| | | * | | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-165-53/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-163-38/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: rsyslog.service.in
| | * | | | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
| * | | | | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| | | | | |
| * | | | | systemd: Remove obsolete ExecStartPre commandMichael Biebl2012-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of the journal in systemd v38 [1], the systemd-kmsg-syslogd.service service was removed. All major distributions which ship systemd use v44 or later in their current releases, so it seems safe to drop the ExecStartPre command. [1] http://lists.freedesktop.org/archives/systemd-devel/2012-January/004188.html
| * | | | | systemd: Drop obsolete compatibility flagMichael Biebl2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In v6 [1], the compatibility mode has been removed and -c is a basically a no-op. So just drop that obsolete command line flag. [1] http://www.rsyslog.com/doc/v6compatibility.html
| * | | | | prepare for version 7.1.11Rainer Gerhards2012-10-163-4/+8
| | | | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-9/+11
| |\| | | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | | * | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
generated by cgit (git 2.34.1) at 2024-04-23 15:18:41 +0000