summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-183-5/+41
|\ | | | | | | | | Conflicts: runtime/msg.c
| * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-183-8/+41
| | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-30/+58
|\| | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-44/+63
| | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-4/+8
|\| | | | | | | | | Conflicts: configure.ac
| * bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-051-1/+2
| | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-051-3/+6
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-1/+1
| | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
* | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-212-47/+113
| | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
* | do not provide weblink with meaningless (generic) error codeRainer Gerhards2012-03-211-2/+2
| |
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-144-38/+60
|\| | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * changed statsobj interface and added better docRainer Gerhards2012-03-144-38/+60
| |
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-123-2/+11
|\|
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-123-2/+11
| | | | | | | | ...due to a regression from statistics module.
* | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-062-3/+57
| | | | | | | | new config directives: $IMUXSockLocalIPIF
* | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-212-0/+2
| | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
* | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| |
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-303-16/+19
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-16/+19
| |\
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+1
| | | | | | | | | | | | configured
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | * increased max config file line size to 64kRainer Gerhards2012-01-241-1/+4
| | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1667-1036/+912
|\| | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * license changesRainer Gerhards2012-01-1645-704/+617
| | |
| | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\|
| | * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | after careful consideration of affected code
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
|\| |
| * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | |
* | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | |
* | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
| | |
* | | added instrumentationRainer Gerhards2011-12-192-1/+12
|/ /
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
|\| | | | | | | | | Conflicts: action.c
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| |\
| | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-1/+1
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-2/+6
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-2/+6
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-1/+1
| |\ \
| | * | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-111-1/+1
| | | |
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-1/+1
| |\| |
| * | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+1
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-141-0/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-111-2/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-11/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| * | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections is aborted