summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* build system: check if jemalloc is present (if requested)Rainer Gerhards2013-11-271-2/+9
|
* output memory allocator in version displayRainer Gerhards2013-11-261-0/+5
|
* Merge branch 'master-jemalloc'Rainer Gerhards2013-11-262-0/+18
|\
| * doc: maintain ChangeLogRainer Gerhards2013-11-261-0/+2
| |
| * add support for jemalloc (experimental)Rainer Gerhards2013-11-261-0/+16
| |
* | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-11-2615-50/+279
|\|
| * Merge branch 'v7-stable'Rainer Gerhards2013-11-251-1/+1
| |\
| | * prepare for upcoming liblognorm 1.0.0 releaseRainer Gerhards2013-11-241-1/+1
| | | | | | | | | | | | | | | The new liblognorm relase has an incompatible API, so we cannot use it to compile this version of rsyslog.
| * | Merge branch 'v7-devel'Rainer Gerhards2013-11-240-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | testbench: add (corrected) test for msg variablesRainer Gerhards2013-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | testbench: stop-localvar did actually test msg vars - now fixedRainer Gerhards2013-11-241-4/+4
| | | |
| * | | testbench: add (corrected) test for msg variablesRainer Gerhards2013-11-241-0/+3
| | | |
| * | | testbench: stop-localvar did actually test msg vars - now fixedRainer Gerhards2013-11-241-4/+4
| | | |
| * | | Merge branch 'v7-devel'Rainer Gerhards2013-11-231-0/+7
| |\| |
| | * | Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-231-0/+7
| | |\|
| | | * doc: add link to new online impstats analyzer toolRainer Gerhards2013-11-221-0/+7
| | | |
| * | | typo fixRainer Gerhards2013-11-221-1/+1
| | | |
| * | | Merge branch 'v7-devel'Rainer Gerhards2013-11-2210-13/+130
| |\| | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | testbench: add test for rfc5424 parserRainer Gerhards2013-11-223-0/+25
| | | |
| | * | testbench: enable test tools to support RFC5424 nativelyRainer Gerhards2013-11-222-11/+46
| | | |
| | * | testbench: add test for mmpstrucdataRainer Gerhards2013-11-223-0/+31
| | | |
| | * | bugfix: mmpstrucdata generated inaccessible propertiesRainer Gerhards2013-11-213-2/+28
| | | |
| * | | Merge branch 'v7-devel'Rainer Gerhards2013-11-212-12/+68
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | queue: dynamic default for discardMark, emit warning if set very lowRainer Gerhards2013-11-212-4/+32
| | | |
| | * | queue: guard various config param defaults against very low queue sizesRainer Gerhards2013-11-211-8/+27
| | | |
| * | | Merge branch 'v7-devel'Rainer Gerhards2013-11-213-9/+58
| |\| |
| | * | doc: add new queue parameterRainer Gerhards2013-11-211-1/+13
| | | |
| | * | queue: add config parameter queue.spooldirectoryRainer Gerhards2013-11-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-212-8/+33
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | | * doc: maintain ChangeLogRainer Gerhards2013-11-211-0/+3
| | | |
| | | * queue: spool directory setting was not properly propagated to DA queueRainer Gerhards2013-11-211-1/+21
| | | |
| | | * refactor queue spool directory config handlingRainer Gerhards2013-11-211-7/+7
| | | |
| * | | regression fix: prevent queue stall if ratelimiter is usedRainer Gerhards2013-11-202-3/+11
| | | | | | | | | | | | | | | | | | | | Thanks to Pavel Levshin for alerting us. This regression was introduced roughly 2 hours ago and was never released.
| * | | Merge branch 'master' into master-alternate-queue-mutexRainer Gerhards2013-11-201-5/+3
| |\ \ \
| * | | | queue workers: eliminate unnecessary queue mutex operationsRainer Gerhards2013-11-201-12/+13
| | | | |
* | | | | doc: improve queue parameter docRainer Gerhards2013-11-261-1/+13
| |/ / / |/| | |
* | | | regression fix: action queues with default settings did not start workersRainer Gerhards2013-11-201-5/+3
|/ / / | | | | | | | | | This was introduced yesterday and has not been part of any released version.
* | | Merge branch 'v7-devel'Rainer Gerhards2013-11-205-4/+35
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | testbench: improve testRainer Gerhards2013-11-201-1/+2
| | |
| * | bugfix: RainerScript optimizer did not optimize PRI filtersRainer Gerhards2013-11-202-4/+7
| | | | | | | | | | | | | | | things like "if $syslogfacility-text == "local3"" were not converted to PRIFILT. This was a regression introduced in 7.5.6.
| * | testbench: add test for RainerScript optimizerRainer Gerhards2013-11-203-0/+27
| | |
* | | doc: maintain ChangeLogRainer Gerhards2013-11-191-0/+7
| | |
* | | Merge branch 'v7-devel'Rainer Gerhards2013-11-194-14/+52
|\| |
| * | Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-191-0/+1
| |\|
| | * bugfix: legacy directive $ActionQueueWorkerThreads was not honoredRainer Gerhards2013-11-194-0/+4
| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | queue.workerThreadMinimumMessage set to queue.size / num workersRainer Gerhards2013-11-193-3/+20
| | |
| * | bugfix: legacy directive $ActionQueueWorkerThreads was not honoredRainer Gerhards2013-11-194-0/+5
| | |
| * | queue: auto-adjust watermarksRainer Gerhards2013-11-193-12/+19
| | |
| * | queue: warn if high watermark is set too lowRainer Gerhards2013-11-191-0/+8
| | |
* | | testbench: fix make distcheckRainer Gerhards2013-11-192-3/+9
| | |