summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2010-12-171-11/+8
|\ | | | | | | | | | | | | | | 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-161-2/+0
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | | * some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-2/+0
| | | |
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-171-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | | |
| | * | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supportedRainer Gerhards2010-12-021-7/+7
| | | | | | | | | | | | | | | | | | | | also cleaned up some minor things
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-051-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
| * | | | minor: improved error message when already runningRainer Gerhards2010-09-171-4/+3
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-09-081-29/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | Merge branch 'systemd' into v5-develRainer Gerhards2010-09-081-29/+32
| |\ \ \ \
| | * | | | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-071-29/+32
| | | | | |
* | | | | | 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!)
| | | * | temporary bugfix replaced by permanent one for...Rainer Gerhards2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...message-induced off-by-one error (potential segfault) (see 4.6.2) The analysis has been completed and a better fix been crafted and integrated.
| * | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-051-0/+3
| | |_|/ | |/| |
* | | | 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-211-50/+50
|/ / / | | | | | | | | | first step: adding object-type specifier to config statement table
* | | 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.
* | | 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.
* | | finshed implementation of strgen modulesRainer Gerhards2010-06-041-9/+11
| | | | | | | | | | | | | | | | | | 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-011-0/+4
| | | | | | | | | | | | | | | and a first built-in strgen module. Some tweaks and more default strgens are needed, but the code doesn't look too bad ;)
* | | some more cleanup and a nasty little bug i doDie()Rainer Gerhards2010-05-101-13/+0
| | |
* | | Merge branch 'v4-devel' into tmpRainer Gerhards2010-04-261-0/+20
|\| |
| * | added new $Sleep directive to hold processing for a couple of seconds during ↵Rainer Gerhards2010-04-261-0/+20
| | | | | | | | | | | | startup
| * | Merge branch 'v4-stable-solaris' into v4-develRainer Gerhards2010-04-121-12/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c tools/syslogd.c
| * \ \ Merge branch 'v4-beta' into tmpRainer Gerhards2010-01-261-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ \ Merge branch 'beta' into masterRainer Gerhards2010-04-091-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
| * \ \ \ \ Merge branch 'v4-stable-solaris' into betaRainer Gerhards2010-04-091-2/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
| | * | | | enhanced nettester tool so that it re-uses it's callers environmentRainer Gerhards2010-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this enables us to work with the "usual" environment tweaks (for debugging and other purposes), without the need for any special handling in nettester itself
| | * | | | added some diagnostics info to startupRainer Gerhards2010-03-231-2/+4
| | | |_|/ | | |/| |
* | | | | Merge branch 'v5-stable'Rainer Gerhards2010-03-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html runtime/datetime.h
| * | | | Merge branch 'v4-stable' into betaRainer Gerhards2010-03-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| | * | | Fix Large File Support (LFS) support (bug #182)Yann Droneaud2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - _FILE_OFFSET_BITS must be defined before including any other system headers otherwise it does nothing. - Don't define it in rsyslog.h, let it be defined in config.h, and let ./configure script enable LFS since Autoconf provides a portable macro to enable LFS support : AC_SYS_LARGEFILE
* | | | | Merge branch 'beta' into masterRainer Gerhards2010-03-011-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | | | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-011-0/+4
| |\| | |
| | * | | moved pipe code to its own moduleRainer Gerhards2010-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... based on old omfile. Michael Biebl reported that xconsole seems to have some issues with the new pipe code, so it was best to use the old code for pipes. The optimizations were done to speed up file access, so it doesn't really matter pipes do not receive them.
| | * | | message parser fixes and testbench enhancementsRainer Gerhards2010-02-221-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files or some other missing parts of the template content. - bugfix: if a message ended immediately with a hostname, the hostname was mistakenly interpreted as TAG, and localhost be used as hostname
| | * | | bugfix: message without MSG part could case a segfaultRainer Gerhards2010-02-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] This actually was a "recent" regression, but I did not realize that it was introduced by the performance optimization in v4-devel. Shame on me for having two devel versions at the same time...
* | | | | Merge branch 'beta'Rainer Gerhards2010-02-031-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-031-1/+5
| |\| | |
| | * | | (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the ↵Cristiano2010-02-031-1/+5
| | | |/ | | |/| | | | | | | | | | | | | | | | | correct value on FreeBSD. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | backporting bugfixes from 5.2.2Rainer Gerhards2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: queues in direct mode could case a segfault, especially if an action failed for action queues. The issue was an invalid increment of a stack-based pointer which lead to destruction of the stack frame and thus a segfault on function return. Thanks to Michael Biebl for alerting us on this problem. [backport from 5.5.2] - bugfix: wrong memory assignment for a config variable (probably without causing any harm) [backport from 5.2.2]