summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-05-031-6/+47
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-7/+47
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-031-5/+42
| | | | | | | | | | | | | | | | | | | | | ...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it.
| | * bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-031-5/+4
| | | | | | | | | | | | | | | | | | While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this...
| | * bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-271-0/+4
| | | | | | | | | | | | at least for prolonged period of time...
* | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-021-1/+2
| | |
* | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-55/+57
| | |
* | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-37/+93
| | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | Merge branch 'v6-stable'Rainer Gerhards2012-04-184-5/+64
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-183-8/+41
| |\|
| | * fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | | | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S
| | * 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.
| * | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵Steven A. Falco2012-04-132-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started.
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-44/+64
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
* | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
| | |
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-30/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-30/+58
| |\ \ \
| | * \ \ 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-devel'Rainer Gerhards2012-04-071-31/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-31/+38
| | | | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion.
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-074-53/+123
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-144-38/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-127-5/+74
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-013-16/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
* | \ \ \ \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-078-52/+177
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-4/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | 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
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-123-2/+11
| |\ \ \ \ \ \
| * | | | | | | 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 'v6-stable'Rainer Gerhards2012-04-071-4/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-4/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | 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>
* | | | | | | impstats: added $PStatsJSON directiveRainer Gerhards2012-04-012-4/+21
| | | | | | |
* | | | | | | stats module: added capability to format as cee-enhanced syslogBrian Knox2012-04-011-0/+50
| | | | | | |
* | | | | | | ommongodb: now writes a real timestamp into mongoRainer Gerhards2012-03-302-10/+21
| | | | | | |
* | | | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-295-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp
* | | | | | | action cfg: do no longer require template for TPL_AS_MSG passing modeRainer Gerhards2012-03-191-1/+0
| | | | | | |
* | | | | | | ommongodb: honor db and collection config parametersRainer Gerhards2012-03-171-0/+1
| | | | | | |
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-174-38/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-144-38/+60
| |\| | | | |
| | * | | | | changed statsobj interface and added better docRainer Gerhards2012-03-144-38/+60
| | | |_|/ / | | |/| | |
generated by cgit (git 2.34.1) at 2024-05-29 19:33:27 +0000