summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
|\ | | | | | | | | Conflicts: runtime/msg.c
| * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| | | | | | | | | | | | 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-126-120/+168
|\| | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| * imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| |
| * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| |
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
| | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-2/+2
|\| | | | | | | | | Conflicts: configure.ac
| * preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-073-3/+3
| |
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-078-10/+238
|\| | | | | | | | | Conflicts: configure.ac
| * bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-052-1/+5
| | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| |
| * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-052-3/+8
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-172-2/+6
| |
| * preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-153-3/+3
| |
| * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-153-1/+211
| |
* | cosmetic: pushing temp version upRainer Gerhards2012-03-221-1/+1
| |
* | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-223-50/+3
| | | | | | | | | | 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-216-65/+130
| | | | | | | | | | ... 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
| |
* | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-203-3/+21
| | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
* | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
| | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
* | added missing initialization of stats countersRainer Gerhards2012-03-143-0/+3
| | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch!
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-146-38/+66
|\| | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * changed statsobj interface and added better docRainer Gerhards2012-03-146-39/+67
| |
* | bumped version number (of temp branch)Rainer Gerhards2012-03-121-1/+1
| |
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-124-2/+15
|\|
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-124-2/+15
| | | | | | | | ...due to a regression from statistics module.
* | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-104-4/+34
| |
* | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| |
* | bugfix: imudp: only two listeners were activatedRainer Gerhards2012-03-091-1/+3
| | | | | | | | no matter how many were defined. Note that IPv4 and IPv6 count as two!
* | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-066-9/+97
| | | | | | | | new config directives: $IMUXSockLocalIPIF
* | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-057-21/+34
|\| | | | | | | | | Conflicts: configure.ac
| * preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-053-3/+3
| |
| * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
| * Install syslog.service Alias for newer systemd versionsMichael Biebl2012-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the syslog.socket unit file of newer systemd versions: The default syslog implementation should make syslog.service a symlink to itself, so that this socket activates the right actual syslog service. Examples: /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service Best way to achieve that is by adding this to your unit file (i.e. to rsyslog.service or syslog-ng.service): [Install] Alias=syslog.service http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26
| * Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
| | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-222-6/+10
| | |
* | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-216-3/+16
| | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
* | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6Rainer Gerhards2012-02-202-2/+4
| | |
* | | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| | |
* | | stats: generate friendly name for action queues, if possibleRainer Gerhards2012-01-312-3/+8
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-307-47/+63
|\| |
| * | undoing last commit: wrong branchRainer Gerhards2012-01-301-1/+1
| | |
| * | indicated special versionRainer Gerhards2012-01-301-1/+1
| | |
| * | added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| | |