summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'udpdrop'Rainer Gerhards2009-05-293-20/+58
|\ | | | | | | | | Conflicts: runtime/conf.c
| * added ability for the UDP output action to rebind its send socket after ↵Rainer Gerhards2009-05-294-21/+60
| | | | | | | | | | | | | | | | sending n messages New config directive $ActionSendUDPRebindInterval added for the purpose. By default, rebinding is disabled. This is considered useful for load balancers.
* | Merge branch 'beta'Rainer Gerhards2009-05-293-2/+3
|\ \ | |/ |/| | | | | Conflicts: runtime/rsyslog.h
| * Merge branch 'v3-stable' into betaRainer Gerhards2009-05-293-2/+3
| |\ | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * fixed a regression of yesterday's patchRainer Gerhards2009-05-293-2/+3
| | | | | | | | | | | | | | | ... I know I should not have done this to a stable branch... Thankfully nothing was yet released.
* | | fix: import from beta accidently disable imdiagRainer Gerhards2009-05-291-3/+0
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-05-293-18/+25
|\| |
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-291-0/+1
| |\|
| | * fixed copy&paste error in previous commitRainer Gerhards2009-05-292-1/+2
| | | | | | | | | | | | (testcase was only present in v4, so I did not spot the issue immediately)
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-293-18/+24
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * fixed problem in syslog-protocol (now RFC5424) parserRainer Gerhards2009-05-293-17/+25
| | | | | | | | | | | | ... as well as some other minor issues.
* | | added forgotten fileRainer Gerhards2009-05-291-0/+0
| | |
* | | Merge branch 'beta' into masterRainer Gerhards2009-05-289-5/+84
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-2811-5/+86
| |\| | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * small enhancement: config validation run now exits with code 1 if an error ↵Rainer Gerhards2009-05-289-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is detected. This change is considered important but small enough to apply it directly to the stable version. [But it is a border case, the change requires more code than I had hoped. Thus I have NOT tried to actually catch all cases, this is left for the current devel releases, if necessary]
| | * bugfix: internal messages were emitted to whatever file had fd2varmojfekoj2009-05-282-1/+4
| | | | | | | | | | | | | | | | | | ...when rsyslogd ran in forked mode (as usual!) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * relaxed GnuTLS version requirement to 1.4.0Rainer Gerhards2009-05-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | after confirmation from the field that this version is sufficient. I always thought so (I think I developed under 1.4.x), but had no longer an environment to verify. Most imporantly, this means that Centos users will have much less trouble building rsyslog/tls support.
| | * bugfix: potential segfault issue when multiple $UDPServerRun directives are ↵Rainer Gerhards2009-05-122-1/+3
| | | | | | | | | | | | | | | | | | specified. Thanks to Michael Biebl for helping to debug this one.
| | * patch from Michael Biebl did not apply completely - manually done...Rainer Gerhards2009-05-121-0/+1
| | |
| | * Fix compiler warningsMichael Biebl2009-05-121-0/+1
| | | | | | | | | | | | Include <string.h> for memcpy and strlen.
* | | doc: added info on when $OptimizeForUniprocessor was made availableRainer Gerhards2009-05-281-1/+1
| | |
* | | Merge branch 'diag'Rainer Gerhards2009-05-286-6/+8
|\ \ \
| * | | fixed make distcheckRainer Gerhards2009-05-286-6/+8
| | | |
* | | | Merge branch 'diag'Rainer Gerhards2009-05-2720-217/+317
|\| | |
| * | | fixed typoRainer Gerhards2009-05-271-3/+1
| | | |
| * | | greatly enhanced testbenchRainer Gerhards2009-05-2720-217/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imdiag module now can very effectively inject messages, which also frees us from uncertainties of tcp reception and processing. All shell script based tests have been modularized, what makes it far easier to create new tests. Also, the test bench now executes more reliable and much faster, because we can now rely on actual engine information where we previously did just a dumb sleep.
* | | | Merge branch 'diag'Rainer Gerhards2009-05-254-1/+92
|\| | |
| * | | added test suite for persistent queue shutdownRainer Gerhards2009-05-254-1/+92
| | | |
* | | | updated project statusRainer Gerhards2009-05-251-4/+4
|/ / /
* | | solved some issues with testbench & a race conditionRainer Gerhards2009-05-253-4/+15
| | |
* | | improved testbench / solved imdiag race conditionRainer Gerhards2009-05-258-14/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | imdiag/imtcp had a modload race condition (as imdiag is a testing aid, this has no implications for production deployments). Also, I replaced netcat by a custom program to talk to imdiag. This, for the first time ever, is now a Java program. I plan to add some GUI troubleshooting tools and thought it is a good idea to start doing things in Java that can simply be done in that language.
* | | preparing for 4.3.1v4.3.1Rainer Gerhards2009-05-254-62/+60
| | |
* | | added new testing module imdiagRainer Gerhards2009-05-2521-82/+289
| | | | | | | | | | | | | | | which enables to talk to the rsyslog core at runtime. The current implementation is only a beginning, but can be expanded over time
* | | fixing some nits with the build systemRainer Gerhards2009-05-222-2/+2
| | |
* | | added capability to run multiple tcp listeners (on different ports)Rainer Gerhards2009-05-2238-221/+584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, actually this and a lot of related things. I improved the testbench so that the new capabilities are automatically tested and also did some general cleanup. The current multiple tcp listener solution will probably receive some further cleanup, too, but looks quite OK so far. I also reviewed the way tcpsrv et all work, in preparation of using this code for imdiag. I need to document the findings, especially as the code is rather complicated "thanks" to the combination of plain tcp and gssapi transport modes.
* | | made imdiag *just* compile & some cleanupRainer Gerhards2009-05-202-27/+26
| | | | | | | | | | | | | | | | | | imdiag was never finished (not even really begun), but now I need it. I made the few things that are available compile, but more serious work is required.
* | | updated ChangeLog with Michael Biebl's changesRainer Gerhards2009-05-191-1/+2
| | |
* | | Cleanup configure.ac a little for better readabilityMichael Biebl2009-05-191-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | - Use 2 new lines as separator between configure options. - Remove forgotten copy&paste text. - Reorder and move template configure option to the end. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Improve ./configure outputMichael Biebl2009-05-191-28/+38
| | | | | | | | | | | | | | | | | | | | | Improve readability of the ./configure output by grouping relevant entries and indenting them. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Rename want_gssapi_krb5 to enable_gssapi_krb5Michael Biebl2009-05-191-6/+6
| | | | | | | | | | | | | | | | | | | | | Be consistent and rename the configure variable want_gssapi_krb5 to enable_gssapi_krb5. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Do not fail "make check" if omstdout is not enabledMichael Biebl2009-05-192-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only run omod-if-array.sh and parsertest.sh test if omstdout plugin is enabled. Remove the comment and fix the help output for --enable-stdout (default was "no", not "yes") Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Fix compiler warningsMichael Biebl2009-05-193-0/+3
| | | | | | | | | | | | | | | | | | include <string.h> for memcpy and strlen. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Cleanup and typo fixesMichael Biebl2009-05-192-7/+3
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Add autogen.shMichael Biebl2009-05-191-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | This file is useful for building rsyslog from git. It is a shortcut for autoreconf and ./configure and enables shave by default. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Add shave supportMichael Biebl2009-05-195-0/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shave tranforms the verbose autotools output into a pretty Kbuild-like one which makes it easier to spot warnings. See also http://damien.lespiau.name/blog/2009/02/18/shave-making-the-autotools-output-sane/ git clone git://git.lespiau.name/shave By default, shave is disabled and you have to explicitly enable it via ./configure --enable-shave. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | doc: given some concrete advise on the common %hostname% content problemRainer Gerhards2009-05-111-1/+8
| | |
* | | added capability to draw configuration graphsRainer Gerhards2009-05-1113-13/+530
| | | | | | | | | | | | | | | | | | | | | | | | - added $GenerateConfigGraph configuration command which can be used to generate nice-looking (and very informative) rsyslog configuration graphs. - added $ActionName configuration directive (currently only used for graph generation, but may find other uses)
* | | Make it recover from errors on insertions.Luis Fernando Muñoz Mejías2009-04-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the database rejected some entry, making the statement fail on it, the batch was not cleaned and the same values were retried over and over, causing a cascade of failures and a denial of service. We use now OCI_BATCH_ERRORS so that everything valid in the batch is inserted, and rejected values can be discarded.
* | | Replace get_db_statement by a template.Luis Fernando Muñoz Mejías2009-04-291-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of reading a complete line, we'll use a template and delegate in the core to read such template. Then, all omoracle has to do is to find that template and use it as the prepared statement. I'm not sure if this is the correct approach, though. It has to dig too much into rsyslog's structures... txt_statement is stored in a private area, so that we don't mess too much with rsyslog's internals (I still don't feel comfortable with this much digging into template structures).
* | | Add the $OmoracleBatchItemSize directiveLuis Fernando Muñoz Mejías2009-04-291-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This directive controls the amount of memory needed for properties in the batch. Users should specify the largest value they expect in the statement. As per Rainer's comment: on MAX_BUFSIZE: I'd tend to make this configurable, because with RFC5424 messages can be much longer and RFC5425 now recommends a minimum maximum size of 8K. So we let users to choose. Maybe we need a sensible default value to make users' lifes easier? Also, the old non-vector based interface is not supported anymore. I broke it already when moving to this stage.