summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-03-093-7/+18
|\ | | | | | | | | | | Conflicts: ChangeLog runtime/datetime.h
| * added new property replacer option "date-rfc3164-buggyday"Rainer Gerhards2010-03-083-7/+17
| | | | | | | | | | primarily to ease migration from syslog-ng. See property replacer doc for details. [backport from 5.5.3 because urgently needed by some]
* | Merge branch 'v4-stable' into betaRainer Gerhards2010-03-082-10/+1
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| * Fix Large File Support (LFS) support (bug #182)Yann Droneaud2010-03-041-9/+0
| | | | | | | | | | | | | | | | | | - _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
| * Includes "config.h" before any other header.Yann Droneaud2010-03-041-1/+1
| | | | | | | | | | | | | | For consistency, ./configure generated "config.h" must be the first header include through out the project. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-012-7/+31
|\|
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-03-011-7/+30
| |\ | | | | | | | | | | | | Conflicts: runtime/ctok.c
| | * bugfix: comment char ('#') in literal terminated script parsingRainer Gerhards2010-03-011-7/+30
| | | | | | | | | | | | | | | ...and thus could not be used. but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119
| * | cleanup: removed debug messages that accidently made it into the commitRainer Gerhards2010-03-012-2/+1
| | |
| * | make $ActonFileDefaultTemplate available to ompipeRainer Gerhards2010-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was not honored by the new ompipe module, because it is a local file directive (it was applied to pipes as a side-effect of using the same module for pipes and files...). I now made this a global, so that semantics are the same as previously. Not really nice, but probably the best thing to do in the current situation (everything else would involve much more overhead --- leave that for the new config system).
* | | Merge branch 'v4-stable' into 'v5-beta'Rainer Gerhards2010-02-252-6/+13
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | message parser fixes and testbench enhancementsRainer Gerhards2010-02-222-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-3/+12
| | | | | | | | | | | | | | | | | | | | | [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 'v4-beta' into betaRainer Gerhards2010-02-101-44/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
| * | several bugfixes for the property replacerRainer Gerhards2010-02-081-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: property replacer returned invalid parameters under some (unusual) conditions. In extreme cases, this could lead to garbled logs and/or a system failure. - bugfix: invalid length returned (often) when using regular expressions inside the property replacer - bugfix: submatch regex in property replacer did not honor "return 0 on no match" config case
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-042-3/+8
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-042-3/+8
| |\ \
| | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-043-4/+9
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | bugfix: potential segfault on queue shutdownvarmojfekoj2010-01-261-9/+14
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | | did some adoptions necessary to use the bugfix with v4-beta code baseRainer Gerhards2010-01-261-6/+6
| | | |
| * | | Merge branch 'queuepatch' into v4-betanewRainer Gerhards2010-01-261-10/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | bugfixes for potential segfaults during queue shutdownvarmojfekoj2010-01-261-9/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | (bugs require certain non-standard settings to appear) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | bugfix: blanks inside file names did not terminate file name parsing.Rainer Gerhards2010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This could reslult in the whole rest of a line (including comments) to be treated as file name in "write to file" actions. Thanks to Jack for reporting this issue.
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-152-4/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.Rainer Gerhards2010-01-152-4/+12
| | | | | | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug.
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-301-1/+1
|\| | |
| * | | bugfix: hostname accidently set to IP address for some message sourcesRainer Gerhards2009-11-301-1/+1
| | | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug.
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-253-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh
| * | | bugfix (kind of): check if TCP connection is still alive if using TLSJonathan Bond-Caron2009-11-251-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-172-2/+5
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-172-2/+5
| | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c
| | | * correcting -q/-Q patch - was invalidRainer Gerhards2009-11-122-2/+5
| | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options.
* | | | some light performance enhancementRainer Gerhards2009-11-127-10/+40
| | | | | | | | | | | | | | | | | | | | ...by replacing time() call with much faster (at least under linux) gettimeofday() calls.
* | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-121-2/+2
|\ \ \ \
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-121-2/+2
| |\| | |
| | * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-121-2/+2
| | |\| |
| | | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-121-2/+2
| | | |\|
| | | | * bugfix: segfault on startup when -q or -Q option was givenRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug.
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-101-0/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | Merge branch 'v4-beta'Rainer Gerhards2009-11-101-0/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | added a so-called "On Demand Debug" modeRainer Gerhards2009-11-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in which debug output can be generated only after the process has started, but not right from the beginning. This is assumed to be useful for hard-to-find bugs. Also improved the doc on the debug system.
* | | | | Merge branch 'v4-devel' into tmpRainer Gerhards2009-11-051-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-051-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | bugfix: named pipes did no longer work (they always got an open error)Rainer Gerhards2009-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | this was a regression from the omfile rewrite in 4.5.0
* | | | | first complete implementation of loadable parser systemRainer Gerhards2009-11-043-2/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have now done the necessary cleanup. Looks like everything is in place. Unfortunately, I do not yet have any actual parser that is not built-in, but I think we can postpone working on that when the first one appears. I don't expect troubles in that case, but you never know ;)
* | | | | added $RulesetParser config directiveRainer Gerhards2009-11-042-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | The implementation is now almost done and works, including doc. I now need to verify shutdown, guess there are some resource leaks left...
* | | | | finalized parser module calling interfaceRainer Gerhards2009-11-044-28/+76
| | | | | | | | | | | | | | | | | | | | | | | | | looks like we are almost done and need only to add the ruleset parser-specific config options.
* | | | | moved rfc3164/5424 code to new parser modulesRainer Gerhards2009-11-046-414/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another milestone commit: the program works, the new interface is used, some more cleanup is needed and the per-ruleset config options are still missing. But we are getting closer...
* | | | | some more cleanup along the wayRainer Gerhards2009-11-031-1/+29
| | | | | | | | | | | | | | | | | | | | ... getting the module structure a bit cleaner ;)