summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into oracleRainer Gerhards2009-04-0227-34/+767
|\ | | | | | | | | Conflicts: Makefile.am
| * Merge branch 'master' of git+ssh://rger@git.adiscon.com/git/rsyslogRainer Gerhards2009-04-016-8/+7
| |\
| | * fixed some problems with "make check"Demo2009-03-316-8/+7
| | | | | | | | | | | | | | | interestingly, they manifested on Debian, only, but potentially existed on other platforms, too.
| * | begining touches for putting rsyslog on spaceshipsRainer Gerhards2009-04-013-0/+139
| |/
| * porting parser tests to solarisRainer Gerhards2009-03-313-35/+64
| |
| * Merge branch 'master' into sol-testRainer Gerhards2009-03-3116-12/+499
| |\ | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * bugfix: "make distcheck" did not workRainer Gerhards2009-03-312-5/+9
| | |
| | * changed parser test suite to be c-program basedRainer Gerhards2009-03-315-88/+270
| | | | | | | | | | | | | | | | | | | | | | | | I finally removed the tcl script because tcl costs a lot of time if you do not invest the full learning cycle, plus I have not everything avaible I need on Solaris. With C, I am quicker and I also can create a superior solution. So I finally switched. Took much less time than the initial tcl script...
| | * solved some more issues with "make [dist]check"Rainer Gerhards2009-03-274-7/+4
| | | | | | | | | | | | especially when executed as non-root
| | * fixed a couple of nits with "make [dist]check"Rainer Gerhards2009-03-275-5/+20
| | |
| | * added some missing files in tests Makefile.amRainer Gerhards2009-03-262-21/+14
| | |
| | * Merge branch 'master' into testsRainer Gerhards2009-03-2610-34/+253
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | initial parser testing suite addedRainer Gerhards2009-03-2610-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | integrated tcl test script into autotools make check, created a few test cases based a real-world sample and samples from RFC3164 and 5424.
| | * | parser test script createdRainer Gerhards2009-03-263-42/+78
| | | | | | | | | | | | | | | | | | | | more or less complete now, with some minor nits left for later but is usable.
| | * | some text scripts added (experimental)Rainer Gerhards2009-03-232-0/+51
| | | |
| | * | improved testing supportRainer Gerhards2009-03-198-6/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worked on ways to provide a better test suite: - added -T rsyslogd command line option, enables to specify a directory where to chroot() into on startup. This is NOT a security feature but introduced to support testing. Thus, -T does not make sure chroot() is used in a secure way. (may be removed later) - added omstdout module for testing purposes. Spits out all messages to stdout - no config option, no other features - modified $ModLoad statement so that for modules whom's name starts with a dot, no path is prepended (this enables relative-pathes and should not break any valid current config)
| * | | ported non-tcl based test suite to SolarisRainer Gerhards2009-03-315-16/+94
| | | |
| * | | bugfix: fixed some segaults on SolarisRainer Gerhards2009-03-253-2/+3
| | |/ | |/| | | | | | | where vsprintf() does not check for NULL pointers
* | | 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.
* | Merge branch 'dapatch'Rainer Gerhards2009-03-256-6/+102
|\ \
| * | bugfix: potential abort with DA queue after high watermark is reachedRainer Gerhards2009-03-256-6/+102
| | | | | | | | | | | | | | | | | | There exists a race condition that can lead to a segfault. Thanks go to vbernetr, who performed the analysis and provided patch, which I only tweaked a very little bit.
* | | Merge branch 'omfile-errHandler'Rainer Gerhards2009-03-244-28/+69
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | omfile suspend handling for non-dynafiles, also bugfixesRainer Gerhards2009-03-192-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primarily bugs introduced by recent changes. We now also handle static file names correctly, that was not the case before. We now correctly reset the descriptor in the dynafile cache if somthing goes wrong. Keep in mind that reliablity of output is depending on the reliability of the file system driver (the cifs driver returns OK, but still loses data if it is disconnected for too-long).
| * | | omfile bugfixingRainer Gerhards2009-03-184-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed a bug that caused action retries not to work correctly situation was only cleared by a restart - bugfix: closed dynafile was potentially never written until another dynafile name was generated - potential loss of messages
| * | | undid typoRainer Gerhards2009-03-171-1/+0
| | | |
| * | | fixed some message-loss situations when file write failures happenedRainer Gerhards2009-03-172-9/+4
| | | |
| * | | changed one more status settingRainer Gerhards2009-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | user feedback indicates it now looks like it is working ;) still some more work needed for a "good" solution
| * | | try to make file writer restartable (experimental, untested)Rainer Gerhards2009-03-111-4/+5
| | | |
* | | | added "rsyslog family tree" graph of rsyslog versions and branchesRainer Gerhards2009-03-231-0/+82
| |_|/ |/| |
* | | fixed broken make distcheck due to invalidly stated omtemplate fileRainer Gerhards2009-03-191-1/+1
| | |
* | | adapted test framework to new script engineRainer Gerhards2009-03-196-22/+46
| | |
* | | added output module templateRainer Gerhards2009-03-165-8/+260
| | | | | | | | | | | | | | | | | | | | | so far, this is mostly some documentation, but I hope that during the process of creating output modules out of it we will get good questions and thus can extend the template. In any case, it should be better than what we had so far...
* | | some more information on rainerscript imlementationRainer Gerhards2009-03-161-0/+2
| | | | | | | | | | | | (taken from old rscript branch, which is now obsolete)
* | | Merge branch 'master' into rscript-funcRainer Gerhards2009-03-1313-20/+55
|\| |
| * | Merge branch 'beta'Rainer Gerhards2009-03-1110-13/+43
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/omrelp.html
| | * \ Merge branch 'v3-stable' into betaRainer Gerhards2009-03-1110-14/+44
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | doc enhance: enhance ommysql documentationRainer Gerhards2009-03-062-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | provide standard template for MySQL module and instructions on how to modify schema
| | | * | doc typo fixRainer Gerhards2009-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | thanks to Trent W. Buck for alerting me.