summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into betaRainer Gerhards2011-09-263-10/+15
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * 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
| | | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | * | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | 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 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 '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 v5-stableRainer Gerhards2011-07-111-7/+9
| |\| | | |
* | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | doc: updated rsyslog.conf man page with new syntaxesRainer 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
| * | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| | | | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| | * | | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9
| | | | |
* | | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-2/+10
| | | | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3
| | | |/ | | |/|
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
* | | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-021-5/+5
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-092-4/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-091-2/+2
| |\| |
| | * | bugfix: invalid storage type for config variablesRainer Gerhards2011-05-091-1/+1
| | | |
| | * | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵Tomas Heinrich2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| | | |
* | | | omfwd: made send function handling incomplete sends correctlyRainer Gerhards2011-04-041-12/+7
| | | |
* | | | added one more testcase for sending TCP/TLS syslogRainer Gerhards2011-04-041-0/+4
| | | |
* | | | omfwd: speeded up tcp forwarding by reducing number of API callsRainer Gerhards2011-04-041-11/+66
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-312-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * | | bugfix: RFC5424 parser confused by empty structured dataRainer Gerhards2011-03-221-2/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
| | | | |
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-1113-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
| | * | | bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-0/+5
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
| * | | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0612-0/+12
| |\ \ \ \
| | * | | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2312-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-252-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | cosmetic: removing commented-out testing aidRainer Gerhards2011-02-251-1/+0
| |/ / / /