summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-193-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
| | | | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | | added instrumentationRainer Gerhards2011-12-192-1/+12
| | | |/ / / | | |/| | |
| * | | | | experimental: added first stats counter to action objectRainer Gerhards2011-12-161-1/+1
| | | | | |
| * | | | | more work on queue statistics counterRainer Gerhards2011-12-162-5/+10
| | | | | |
| * | | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-162-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-162-38/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | | enhanced module loader to not rely on PATH_MAXRainer Gerhards2011-12-161-34/+46
| | | | | |
| * | | | | one further change to support gnutls without libgcryptRainer Gerhards2011-10-211-0/+2
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2011-12-121-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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 'beta'Rainer Gerhards2011-10-272-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-2/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | 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 'v5-stable' into betaRainer Gerhards2011-10-212-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | | | | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | | | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-214-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-213-3/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | | | | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-212-1/+2
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-181-1/+1
| | | | | | | | | |
| * | | | | | | | | removed dependency on gcrypt for recently-enough GnuTLSRainer Gerhards2011-10-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
| * | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-172-11/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-172-11/+51
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-132-11/+51
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| | * | | | | | | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-131-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| | * | | | | | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| * | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-111-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-264-2/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
| | * | | | | | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| * | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-0/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-2/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html