summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'oracle' into nextmasterRainer Gerhards2009-04-086-2/+419
|\
| * Merge branch 'nextmaster' into oracleRainer Gerhards2009-04-087-24/+130
| |\
| * \ Merge branch 'nextmaster' into oracleRainer Gerhards2009-04-0741-80/+664
| |\ \
| * \ \ Merge branch 'master' into oracleRainer Gerhards2009-04-0321-30/+259
| |\ \ \
| * \ \ \ Merge branch 'master' into oracleRainer Gerhards2009-04-025-4/+58
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into oracleRainer Gerhards2009-04-0227-34/+767
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am
| * | | | | | some small changes (as suggestion)Rainer Gerhards2009-04-011-8/+6
| | | | | | |
| * | | | | | Convert the module configuration to $Action... directives.Luis Fernando Muñoz Mejías2009-04-011-23/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the old-style configuration parameters, use $... directives, which lead to simpler code, and also should make user's configurations simpler. Needs some testing. Currently, the supported directives are $OmoracleDB, $OmoracleDBUser and $OmoracleDBPassword. $OmoracleDBStatement and $OmoracleDBBatchSize may follow.
| * | | | | | Add a SELinux policy that allows the module to load on RHEL5.Luis Fernando Muñoz Mejías2009-04-011-0/+13
| | | | | | |
| * | | | | | Make tryResume not to retry the last action, but just to reconnect.Luis Fernando Muñoz Mejías2009-04-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core will call the action if tryResume succeeds, no need to make it from here.
| * | | | | | added some (hopefully helpful) comments on the calling IFRainer Gerhards2009-03-251-0/+27
| | | | | | |
| * | | | | | Remove useless dbgprintf and add documentation.Luis Fernando Muñoz Mejías2009-03-251-2/+10
| | | | | | |
| * | | | | | Add proper indentation (despite Emacs) and support for retrying.Luis Fernando Muñoz Mejías2009-03-251-78/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs doesn't allow for proper indentation with rsyslog's macros (no curly brackets, so it doesn't know where functions start), so I had to manually add such indentation. Add support for retrying actions, namely, disconnect from the DB, re-connecting and re-executing the last prepared statement. Needs to be tested.
| * | | | | | Add the ability to actually run statements.Luis Fernando Muñoz Mejías2009-03-251-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now runs SQL statements given as templates. In this case, the template is given on the configuration file and the core passes the SQL statement correctly formatted to doAction. I still need to decide how to structure this for having prepared statements (prepare them at parseSelector time) and then make doAction to only bind arguments and execute. It commits after each statement, which is awfully slow but good enough for the moment. Next step after that is have a buffer of arguments, and make doAction store new data as it arrives, then run the statement only when the buffer is almost full. Or something like that.
| * | | | | | Add the ability to connect to the DB based on the config line.Luis Fernando Muñoz Mejías2009-03-251-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will read and parse the config line (this code is not yet rock-solid) and connect to the database at initialization time. I also cleaned some debug messages that are not needed anymore.
| * | | | | | Add handlers on modInit.Luis Fernando Muñoz Mejías2009-03-251-9/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids crashes on initialization.
| * | | | | | Add all other blocks (macros) needed to make this module work.Luis Fernando Muñoz Mejías2009-03-251-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this stage they are all empty, but at least it should be possible to instantiate the module and perform some basic tests. Fix some compilation warnings
| * | | | | | Include omoracle in the build system.Luis Fernando Muñoz Mejías2009-03-253-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configure option to build the oracle support, named --enable-oracle and fix the Makefile.am accordingly.
| * | | | | | Start the output module for Oracle.Luis Fernando Muñoz Mejías2009-03-253-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, resources are allocated, freed and the code compiles. No tests yet.
* | | | | | | bugfix: solved potential memory leak in msg processingRainer Gerhards2009-04-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could manifest itself in imtcp (loss of a few bytes for *each* received message - but depended on config) -- this was newly introduced
* | | | | | | fixed some portability issuesRainer Gerhards2009-03-165-5/+21
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | first noticed on FreeBSD Also, some cosmetic improvements.
* | | | | | improved testbench, added tests for tcp-based receptionRainer Gerhards2009-04-087-24/+130
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into nextmasterRainer Gerhards2009-04-077-15/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | final touches for 4.1.6 releasev4.1.6Rainer Gerhards2009-04-071-0/+2
| | | | | |
| * | | | | Re-enable parsing host names from message.Luis Fernando Muñoz Mejías2009-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a subtle bug that made all messages fill their HOSTNAME from the source IP (which may be wrong in a long chain of relays) and not by reading the message. This fixes it.
| * | | | | updating changelog for releaseRainer Gerhards2009-04-071-3/+5
| | | | | |
| * | | | | Merge branch 'beta'Rainer Gerhards2009-04-076-11/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf.html
| | * | | | | preparing for 3.21.11v3.21.11Rainer Gerhards2009-04-033-3/+3
| | | | | | |
| | * | | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-04-0210-11/+126
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | | | preparing for 3.20.5 releasev3.20.5Rainer Gerhards2009-04-024-4/+12
| | | | | | | |
| | | * | | | | Merge branch 'dapatch' into v3-stableRainer Gerhards2009-04-026-6/+102
| | | |\ \ \ \ \
| | | * | | | | | fixed bugs in RainerScriptvarmojfekoj2009-03-163-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when converting a number and a string to a common type, both were actually converted to the other variable's type. - the value of rsCStrConvertToNumber() was miscalculated. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | * | | | | | added link to online tutorial on the webRainer Gerhards2009-03-161-1/+5
| | | | | | | | |
| | | * | | | | | added link to (new) online video tutorials to manual setRainer Gerhards2009-03-111-0/+1
| | | | | | | | |
* | | | | | | | | testcase added (on user request)Rainer Gerhards2009-04-061-0/+3
| | | | | | | | |
* | | | | | | | | improved internal handling of RainerScript functionsRainer Gerhards2009-04-0612-32/+345
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - building the necessary plumbing to support more functions with decent runtime performance. This is also necessary towards the long-term goal of loadable library modules. - added new RainerScript function "tolower"
* | | | | | | | made sure udptester terminates only after rsyslgod it spawnedRainer Gerhards2009-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We noticed this race issue under Solaris (thanks to its different scheduler, I guess). In some cases, the previous instance of rsyslogd was not terminated, resulting in a failure on the next test. Now handled correctly.
* | | | | | | | improved parser test suiteRainer Gerhards2009-04-037-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new tests added, now much better
* | | | | | | | improved test suite and added test for new output module interfaceRainer Gerhards2009-04-0314-25/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testbench has now a generic driver that can run a whole class of test suites just by providing a config file and test cases. This does not cover all testing needs, but a lot. We have now added one test for the new array-passing output plugin interface.
* | | | | | | | added (some) developer documentation for output plugin interfaceRainer Gerhards2009-04-034-7/+190
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | added a new way how output plugins may be passed parameters.Rainer Gerhards2009-04-0310-10/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more efficient for some outputs. They new can receive fields not only as a single string but rather in an array where each string is seperated.
* | | | | | | Merge branch 'regex'Rainer Gerhards2009-04-025-8/+42
|\ \ \ \ \ \ \
| * | | | | | | fully integrated regex patchRainer Gerhards2009-04-024-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now have removed the previous method, as really nobody should call it any longer (and now nobody does ;)). Also did some other cleanup.
| * | | | | | | streamlined regex patchRainer Gerhards2009-04-024-30/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - abided to code conventions - fixed a potential segfault when regex library can not be loaded
| * | | | | | | improved performance of regexp-based filtersRainer Gerhards2009-04-024-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Arnaud Cornet for providing the idea and initial patch.
* | | | | | | | clean compile on solarisRainer Gerhards2009-04-022-2/+7
|/ / / / / / /
* | | | | | | added O_CLOEXEC to open() callsRainer Gerhards2009-04-025-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make sure only the minimum number of file handles is left open during a exec call. This is not a 100% solution, as there are also some fopen() calls and, more importantly, file descriptors opened by libraries. But it is better than nothing (and it was quick, at least until we run into platform hell, what we will for sure ;)).
* | | | | | | add csv support to feature sheetRainer Gerhards2009-04-021-0/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | added new "csv" property replacer optionRainer Gerhards2009-04-025-4/+58
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | to enable simple creation of CSV-formatted outputs (format from RFC4180 is used)
* | | | | Merge branch 'master' of git+ssh://rger@git.adiscon.com/git/rsyslogRainer Gerhards2009-04-016-8/+7
|\ \ \ \ \