summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | | | | | | |
| | * | | | | | relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | after carful check for copyright holder
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-211-2/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | | |_|_|/ | | |/| | |
* | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-112-73/+232
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-263-13/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-10/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
| | * | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-222-6/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
| | | * | | bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| | | * | | Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-153-31/+98
| | | |\ \ \
| | | | * \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+9
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | | | | | | |
| | | | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-112-2/+12
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-301-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
| * | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-301-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | / / / / / | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| | | * | | | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | | |_|_|_|/ / | | | |/| | | | |
* | | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-181-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| * | | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* | | | | | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
| | | | | | | | |
* | | | | | | | | working around automake curiosityRainer Gerhards2011-07-221-1/+4
| | | | | | | | |
* | | | | | | | | build system cleanup/improvementRainer Gerhards2011-07-221-1/+2
| | | | | | | | |
* | | | | | | | | omusrmsg now supports the new config systemRainer Gerhards2011-07-212-39/+128
| | | | | | | | |
* | | | | | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-47/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work).
* | | | | | | | | milestone: new output plugin interface call addedRainer Gerhards2011-07-212-0/+4
| | | | | | | | |
* | | | | | | | | milestone: on the way to a new action conf interface to plugins...Rainer Gerhards2011-07-201-0/+81
| | | | | | | | |
* | | | | | | | | cleanupRainer Gerhards2011-07-201-21/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'v5-stable'Rainer Gerhards2011-07-131-7/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge branch 'master-newconf'Rainer Gerhards2011-07-123-244/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c
| * | | | | | | removed compatibility mode as we expect people have adjusted their confs by nowRainer Gerhards2011-07-121-234/+13
| | | | | | | |
| * | | | | | | removed emergency config, do error reporting on fatal config file errorRainer Gerhards2011-07-121-1/+1
| | | | | | | |
| * | | | | | | cleanup, removing now unused codeRainer Gerhards2011-07-112-6/+0
| | | | | | | |
| * | | | | | | milestone/[PARTWORK]: made sure all legacy selectors workRainer Gerhards2011-07-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... except for the not guaranteed $outchannel construct, which we could not fix without syntax change. Shouldn't hurt too many.
| * | | | | | | milestone/[PARTWORK]: implemented comparison operationsRainer Gerhards2011-07-081-1/+0
| | | | | | | |