summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| |\|
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-273-0/+9
| | | | | | | | | | | | 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-242-1/+7
| | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
| | * licensing changeRainer Gerhards2012-01-212-31/+29
| | |
* | | bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-272-4/+5
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-244-3/+9
|\| | | | | | | | | | | | | | Conflicts: configure.ac
| * | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| |\|
| | * license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
| | | | | | | | | | | | thanks to Tomas Heinrich for alerting me.
| * | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |
* | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| | |
* | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
|\| |
| * | licensing updateRainer Gerhards2012-01-161-17/+16
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| |\| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
|\| | | | | | | | | | | | | | 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 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | |
| | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | |