summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2010-12-175-17/+10
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-3/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| | * added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+3
| | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| | * cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1
| | |
| | * Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-165-8/+2
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | * \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-192-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
| * | \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-175-7/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * \ \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-164-6/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | | * | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-164-6/+0
| | | | | |
| | | * | | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-301-2/+2
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | | |
| * | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supportedRainer Gerhards2010-12-021-7/+7
| | | | | | | | | | | | | | | | | | | | also cleaned up some minor things
* | | | | mmnormalize loads & runs (basic testing done)Rainer Gerhards2010-12-011-1/+1
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-251-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
| | * | | bugfix: replacements for atomic operations for non-int sized types had problems.Rainer Gerhards2010-11-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile).
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-222-1/+2
|\| | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-10-222-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-192-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| | | * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-192-1/+2
| | | | |
| | * | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | removed need for math libraryRainer Gerhards2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically).
* | | | | omhdfs: fixed some issues with new config interface functionsRainer Gerhards2010-10-051-22/+0
| | | | | | | | | | | | | | | | | | | | also did some cleanup in omfile.c
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-052-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
| * | | | imuxsock: changed to per-pid ratelimitingRainer Gerhards2010-09-281-1/+1
| | | | |
| * | | | minor: improved error message when already runningRainer Gerhards2010-09-171-4/+3
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-09-082-30/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | Merge branch 'systemd' into v5-develRainer Gerhards2010-09-082-30/+33
| |\ \ \ \
| | * | | | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-072-30/+33
| | | | | |
* | | | | | Merge branch 'master' into tmpRainer Gerhards2010-08-111-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h also updated omuxsock and imptcp to new interfaces
| * | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-111-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| | * | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | | * | | added imptcpRainer Gerhards2010-08-101-1/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
| * | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-051-0/+3
| | |_|/ | |/| |
* | | | fixed regression from last commitRainer Gerhards2010-07-276-0/+6
| | | | | | | | | | | | | | | | config variables were not properly initialized
* | | | milestone commit: output plugin interface changes (may NOT run)Rainer Gerhards2010-07-276-103/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt).
* | | | added support to save/restore rsyslog core action settings...Rainer Gerhards2010-07-231-5/+0
| | | | | | | | | | | | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit.
* | | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-213-77/+77
|/ / / | | | | | | | | | first step: adding object-type specifier to config statement table
* | | fixed a couple of regressionsRainer Gerhards2010-06-234-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | by implementing some code that was missing so far ;) as well as finding some real bugs. I also did some general cleanup, removing debug strings and such. This code should be fairly OK to use, except when "exec only when previous action was suspended" is used -- this is NOT yet re-implemented in the tuned engine.
* | | milestone(BUGGY): batch now pushed down to actionRainer Gerhards2010-06-151-12/+1
| | | | | | | | | | | | | | | | | | | | | at least in important cases (not for non-direct action queues and some other minor things). This version is definitely buggy, but may be tried with success on a non-production system. I will continue to work on the correctness, but needed to commit now to get a baseline.
* | | milestone commit(BUGGY): batch is now handed down to rule processingRainer Gerhards2010-06-101-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | Now, the full batch is passed down to the rule, which then enqueues the elements as single messages. Note that this code has some known defects and needs more changes until it is correct again. This is primarily a commit to be able to return to a known-(somewhat)-good state.
* | | some cleanupRainer Gerhards2010-06-101-1/+0
| | | | | | | | | | | | | | | as well as some work in preparation of storing doAction params inside the batch
* | | Merge branch 'concurrent-output' into tmpRainer Gerhards2010-06-101-26/+48
|\ \ \
| * | | main msg q consumer now preprocesses messages before doing rule processingRainer Gerhards2010-06-091-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | things like ACL check and message parsing. This leads to a greater level of concurrent processing. Beware, though, that this commit duplicates some messages. May be a regression from this or an earlier commit. I will soon sort out.
| * | | somewhat improved direct mode queue performanceRainer Gerhards2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | ... but only for batch enqueues. This will not help much with the current code, but will play well with upcoming changes.
* | | | fixing msg duplication & loss regression, causes slowdownRainer Gerhards2010-06-101-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | messages could get lost or be duplicated due to non-proper sync of transactions. This is a notable slowdown again, but we know how to get back concurrency, it just takes "some" more programming. It is important now to come back to correct code, so that we can base further improvements on that.
* | | bugfix: regression caused more locking action in msg.c than necessaryRainer Gerhards2010-06-081-29/+7
| | | | | | | | | | | | also: bugfix: mutexes used to similate atomic instructions were not destructed
* | | finshed implementation of strgen modulesRainer Gerhards2010-06-049-81/+574
| | | | | | | | | | | | | | | | | | and also provided four build-in modules for the most common use cases, hopefully resulting in a speedup of around 5% for typical rsyslog processing.
* | | first implementation of strgen interfaceRainer Gerhards2010-06-014-0/+191
| | | | | | | | | | | | | | | and a first built-in strgen module. Some tweaks and more default strgens are needed, but the code doesn't look too bad ;)