Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-06-14 | 14 | -1/+1554 |
|\ | |||||
| * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-14 | 13 | -1/+1552 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | preparing for 6.2.2 releasev6.2.2 | Rainer Gerhards | 2012-06-13 | 3 | -3/+5 |
| | | | |||||
| | * | added rpm spec files for rhel / centos | Abby Edwards | 2012-06-13 | 12 | -0/+1549 |
| | | | |||||
| * | | adding pkgconfigdir definition to Makefile.am to help build properly | Abby Edwards | 2012-06-13 | 1 | -0/+2 |
| | | | |||||
* | | | bump default omfile iobuffer size to 4k | Rainer Gerhards | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | (should originally have this value; larger value makes limited sense giving current batch sizes) | ||||
* | | | fixing memory leaks in expression-based filters | Rainer Gerhards | 2012-06-14 | 3 | -0/+77 |
| | | | | | | | | | | | | most recently added by re_match() function | ||||
* | | | re_match() function now also executes | Rainer Gerhards | 2012-06-13 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | things now basically work. however, there is at least a (small) memory leak and the code needs to be further reviewed | ||||
* | | | milestone: regex is compiled from script based filter | Rainer Gerhards | 2012-06-12 | 4 | -3/+63 |
| | | | |||||
* | | | cosmetic: merge remains in ChangeLog cleared up | Rainer Gerhards | 2012-06-12 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'master-regexp' | Rainer Gerhards | 2012-06-12 | 2 | -2/+18 |
|\ \ \ | |||||
| * | | | first experiments with regexp'es in RainerScript | Rainer Gerhards | 2012-05-29 | 2 | -2/+18 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-06-11 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ \ | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 2 | -4/+38 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 2 | -4/+38 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 3 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting | ||||
| | * | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris | ||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 2 | -2/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | bugfix: expression-based filters with AND/OR could segfault | Rainer Gerhards | 2012-06-11 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to a problem with boolean shortcut operations. From the user's perspective, the segfault is almost non-deterministic (it occurs when a shortcut is used). Thanks to Lars Peterson for providing the initial bug report and his support in solving it. | ||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-06 | 10 | -53/+68 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| | * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c | ||||
| | | * | | | preparing for 5.8.12v5.8.12 | Rainer Gerhards | 2012-06-06 | 3 | -3/+3 |
| | | | | | | |||||
| | | * | | | bugfix: property PROCID was empty instead of proper nilvalue if not present | Rainer Gerhards | 2012-06-06 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue. | ||||
| | | * | | | bugfix: potential hang due to mutex deadlock | Rainer Gerhards | 2012-06-06 | 4 | -33/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it. | ||||
| | | * | | | fixing memleak in recent group resolve patch | Rainer Gerhards | 2012-06-06 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | also added some error checking | ||||
| | | * | | | call getgrnam_r repeatedly to get all group members. | Alec Warner | 2012-06-06 | 1 | -3/+12 |
| | | | | | | |||||
| | | * | | | add small delay (50ms) after sending shutdown message | Rainer Gerhards | 2012-06-04 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up. | ||||
| * | | | | | Remove obsolete ommongodb build instructions | Miloslav Trmač | 2012-06-05 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin now uses libmongo-client (which is configured using pkg-config) instead of the 10gen client, so the instructions to copy client source code no longer apply. | ||||
| * | | | | | regression fix: last memleak bugfix caused abort in some situations | Rainer Gerhards | 2012-06-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was introduced by the fix I did roughly an hour ago. Obviously, no released version is affected. | ||||
| * | | | | | restructured cfsysline handling a bit | Rainer Gerhards | 2012-06-05 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | so that we have cleaner code | ||||
| * | | | | | fixing small memleak during config read phase | Rainer Gerhards | 2012-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traditional system line buffers were not freed. semi-static memory leak during config load phase, did not grow while processing messages. Usually less than 5k during the whole runtime. | ||||
* | | | | | | cosmetic: updated ChangeLog to mention new 0mq plugins | Rainer Gerhards | 2012-06-04 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-04 | 4 | -16/+35 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10 | Rainer Gerhards | 2012-06-04 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Miloslav Trmač for providing patches and suggestions | ||||
| * | | | | | cosmetic: removed autoconf warning messages | Rainer Gerhards | 2012-06-04 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | preparing for 6.3.10 | Rainer Gerhards | 2012-06-04 | 3 | -3/+13 |
| | | | | | | |||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-04 | 2 | -7/+10 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | bugfix: --enable-smcustbindcdr configure directive did not work | Ultrabug | 2012-06-04 | 2 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | | Merge branch 'master-zmq' | Rainer Gerhards | 2012-06-01 | 11 | -5/+1251 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Minor updates | David Kelly | 2012-06-01 | 4 | -75/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * C++ style comments converted to c-style * copy/paste error (benign I believe) in omzmq3 fixed * added readme files for both imzmq3 and omzmq3 | ||||
| * | | | | | | added new-style zeromq plugins, based on czmq api and rsyslog v6 conf | David Kelly | 2012-05-29 | 9 | -5/+1198 |
| | | | | | | | |||||
* | | | | | | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 2 | -1/+10 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-01 | 4 | -13/+33 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 7 | -16/+52 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| * | | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 4 | -13/+33 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | |