Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor: some better debug instrumentation | Rainer Gerhards | 2011-04-27 | 1 | -2/+4 |
| | |||||
* | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 4 | -28/+39 |
| | |||||
* | step: added config-specific module list | Rainer Gerhards | 2011-04-27 | 7 | -51/+158 |
| | |||||
* | step: $ModLoad handler no longe requries conf obj | Rainer Gerhards | 2011-04-27 | 5 | -17/+13 |
| | | | | | re-doing the interface, global var "loadConf" now holds that data. Makes things simpler with legacy handler, as well as new functionality. | ||||
* | step: shuffled module-related code from syslogd.c to rsconf.c | Rainer Gerhards | 2011-04-27 | 2 | -1/+174 |
| | | | | ... plus some minor cleanup/code shuffle | ||||
* | step: outchannel list integrated into main config object | Rainer Gerhards | 2011-04-26 | 3 | -0/+11 |
| | |||||
* | step: moved config validation code | Rainer Gerhards | 2011-04-26 | 1 | -9/+33 |
| | |||||
* | shuffled even more config code from syslgod to config handler | Rainer Gerhards | 2011-04-26 | 2 | -3/+115 |
| | |||||
* | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 8 | -15/+437 |
| | |||||
* | step: begun to create a "load" interface in rsconf | Rainer Gerhards | 2011-04-21 | 2 | -2/+137 |
| | |||||
* | step: slowly migrating config settings... ;) | Rainer Gerhards | 2011-04-19 | 5 | -4/+85 |
| | |||||
* | some more work was required on the ruleset modification | Rainer Gerhards | 2011-04-19 | 5 | -29/+40 |
| | |||||
* | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 7 | -63/+83 |
| | |||||
* | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 4 | -30/+39 |
| | |||||
* | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 7 | -1/+184 |
| | |||||
* | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 6 | -8/+8 |
| | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". | ||||
* | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 6 | -8/+8 |
| | |||||
* | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 3 | -5/+21 |
|\ | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| * | bugfix: $myhostname not available in RainerScript (and no error message) | Rainer Gerhards | 2011-04-14 | 3 | -5/+21 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233 | ||||
* | | bugfix (kind of): memory leak with tcp reception epoll handler | Rainer Gerhards | 2011-04-13 | 1 | -2/+12 |
| | | | | | | | | | | This was an extremely unlikely leak and, if it happend, quite small. Still it is better to handle this border case. | ||||
* | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -16/+13 |
| | | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-12 | 2 | -117/+119 |
|\| | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c | ||||
| * | cleanup: initially thought temporary debug message made durable ;) | Rainer Gerhards | 2011-04-12 | 1 | -2/+2 |
| | | | | | | | | | | It has proven to be very valuable, so now it is properly formatted inside the source. | ||||
| * | bugfix: race condition in deferred name resolution | Rainer Gerhards | 2011-04-08 | 1 | -115/+117 |
| | | | | | | | | | | | | Note that this actually is a very small change, but I needed to shuffle a lot of code around in order to make it compile (due to required define order...). | ||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 4 | -3/+17 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | stop adding data to DA queue when low watermark has been reached | Rainer Gerhards | 2011-03-30 | 1 | -0/+4 |
| | | | | | | | | | | potentially closes: http://bugzilla.adiscon.com/show_bug.cgi?id=241 But needs more verification. | ||||
| * | bugfix: PRI was invalid on Solaris for message from local log socket | Corey Smith | 2011-03-24 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: root <root@localhost.localdomain> | ||||
| * | enhance: added $BOM system property to ease writing byte order masks | Rainer Gerhards | 2011-03-22 | 2 | -0/+11 |
| | | |||||
| * | backporting patch for clean make distcheck | Rainer Gerhards | 2011-03-16 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-14 | 2 | -5/+11 |
|\ \ | | | | | | | | | | | | | Conflicts: tests/diag.sh | ||||
| * | | fixing cosmetic memory leak in imdiag, imfile | Rainer Gerhards | 2011-03-14 | 1 | -0/+3 |
| |/ | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench. | ||||
| * | Fall back to epoll_create() if epoll_create1() is not available | Michael Biebl | 2011-03-14 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996 | ||||
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 10 | -4/+85 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 10 | -4/+85 |
| |\ | |||||
| | * | bugfix: regression: memory leak in module loader | Bojan Smojver | 2011-03-04 | 2 | -13/+21 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 10 | -4/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'master-tcpsrv-mt'v6.1.5 | Rainer Gerhards | 2011-03-04 | 6 | -40/+41 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ | Merge branch 'master' into master-tcpsrv-mt | Rainer Gerhards | 2011-02-28 | 17 | -57/+232 |
| |\ \ \ | |||||
| * | | | | completed new TLS code in tcpflood | Rainer Gerhards | 2011-02-28 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | (somewhat) improved TLS subsystem | Rainer Gerhards | 2011-02-01 | 1 | -22/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved TLS error reporting - improved TLS startup (Diffie-Hellman bits do not need to be generated, as we do not support full anon key exchange -- we always need certs) | ||||
| * | | | | tcpsrv select-handler experimentally moved to multi-threading as well | Rainer Gerhards | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | first tests done with plain tcp, TLS subsystems tests need to be carried out. No serious lab testing done so far. | ||||
| * | | | | fixing regression: multi-threading had races | Rainer Gerhards | 2011-01-31 | 4 | -1/+11 |
| | | | | | |||||
| * | | | | interim commit: current debug state of new imptcp | Rainer Gerhards | 2011-01-28 | 1 | -17/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I need to verify the concept used in a simpler environment, and this means I probably need to freeze the (non-working) state here for a couple of days. | ||||
| * | | | | resolved problem with intermixing requests | Rainer Gerhards | 2011-01-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | experimental: added thread pool to tcpsrv epoll handler | Rainer Gerhards | 2011-01-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this seems to work in lab, but is brand-new code. needs practice drill. | ||||
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-01 | 1 | -1/+2 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | Conflicts: ChangeLog | ||||
| * | | | bugfix: potential abort condition when $RepeatedMsgReduction set to on | Rainer Gerhards | 2011-03-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had taken place. In other words, this was a strange problem that could lead to hard to diagnose instability. So if you experience instability, chances are good that this fix will help. | ||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 5 | -11/+38 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | bugfix: fixed a memory leak and potential abort condition | Rainer Gerhards | 2011-02-25 | 2 | -10/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-02-25 | 1 | -0/+5 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: ChangeLog |