summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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 '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]
* | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-0/+1
|\| | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * bugfix: -d did not enable display of debug messagesRainer Gerhards2010-01-191-0/+1
| | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug
* | Merge branch 'v4-beta' into betaRainer Gerhards2009-12-041-0/+1
|\|
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-12-041-0/+1
| |\
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-12-041-0/+1
| | |\
| | | * bugfix: potential segfault when -p command line option was usedRainer Gerhards2009-12-041-0/+1
| | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-251-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-171-2/+2
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-171-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c
| | | * correcting -q/-Q patch - was invalidRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options.
* | | | some light performance enhancementRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | ...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-4/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-141-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
* | | | | | | some module cleanupRainer Gerhards2009-11-121-3/+0
| | | | | | |
* | | | | | | Merge branch 'v4-beta'Rainer Gerhards2009-11-101-4/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | added a so-called "On Demand Debug" modeRainer Gerhards2009-11-101-4/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | first complete implementation of loadable parser systemRainer Gerhards2009-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ;)
* | | | | | moved rfc3164/5424 code to new parser modulesRainer Gerhards2009-11-041-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... getting the module structure a bit cleaner ;)
* | | | | | one step closer to dynamically loadable parsersRainer Gerhards2009-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a milestone commit, which adds new code that breaks nothing, but also does not add any visible change. Just prep work...
* | | | | | more cleanup and working towards a parser module calling interfaceRainer Gerhards2009-11-031-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I cleaned up a lot of config variable access along the way. This version compiles and runs, but does not yet offer any enhanced functionality. pmrfc5424 is just a dummy that is not yet being used.
* | | | | | restructured parser part of rsyslogRainer Gerhards2009-11-031-440/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now cleaner and hopefully usuable as a basis for loadable parser modules. I also cleaned up/consolidated some of the internal message generation functionality in rsyslogd.
* | | | | | ruleset queue setting was not honored during multi-submitRainer Gerhards2009-11-031-4/+10
| | | | | |
* | | | | | bugfix: correct default for escape ('#') character restoredRainer Gerhards2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidently changed to '\\', thanks to David Lang for reporting the bug.
* | | | | | added the capability to have ruleset-specific main message queuesRainer Gerhards2009-10-271-53/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This offers considerable additional flexibility AND superior performance (in cases where multiple inputs now can avoid lock contention)
* | | | | | some more cleanup - action config line handlers are now defined in action.cRainer Gerhards2009-10-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | As an artifact of early development, they were registered in syslogd.c
* | | | | | enhanced test environment (including testbench)Rainer Gerhards2009-10-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for enhancing probability of memory addressing failure by using non-NULL default value for malloced memory (optional, only if requested by configure option). This helps to track down some otherwise undetected issues within the testbench and is expected to be very useful in the future.
* | | | | | Merge branch 'newqueue'Rainer Gerhards2009-10-211-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | | | | | bugfix: message processing states were not set correctly in all casesRainer Gerhards2009-10-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | however, this had no negative effect, as the message processing state was not evaluated when a batch was deleted, and that was the only case where the state could be wrong.
| * | | | | | Merge branch 'master' into newqueueRainer Gerhards2009-10-151-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | | new queue engine - initial commit (probably not 100% working!)Rainer Gerhards2009-10-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified and thus speeded up the queue engine, also fixed some potential race conditions (in very unusual shutdown conditions) along the way. The threading model has seriously changes, so there may be some regressions. NOTE: the code passed basic tests, but there is still more work and testing to be done. This commit should be treated with care.
| * | | | | | | added some debug settings plus improved shutdown sequenceRainer Gerhards2009-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... non-working version!
* | | | | | | | cleanup: finally moved some config variables just to conf.cRainer Gerhards2009-10-191-16/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2009-10-141-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-10-141-1/+2
| |\| | | | |