summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added doc for $MaxOpenFiles directiveRainer Gerhards2009-04-144-12/+48
|
* implemented $MaxOpenFiles directive and changed testbenchRainer Gerhards2009-04-145-16/+89
| | | | ... to utilize it. This work is not yet fully verified to be correct.
* Merge branch 'nextmaster' of git+ssh://rger@git.adiscon.com/git/rsyslog into ↵Rainer Gerhards2009-04-092-1/+4
|\ | | | | | | nextmaster
| * fixed testbench compilation problem on SolarisRainer Gerhards2009-04-092-1/+4
| | | | | | | | | | Solaris network libraries needed to be specified in linker options
* | fixed compile-time problems in im3195Rainer Gerhards2009-04-091-1/+2
|/ | | | | | ... however, I did not not a test run due to the lack of existing test drivers and the very low (aka "non-existing" interest from the userbase in the feature).
* working some more on "make distcheck"Rainer Gerhards2009-04-093-2/+5
| | | | ... this time I think successfully (at least on Fedora...)
* fixing "make distcheck"Rainer Gerhards2009-04-091-0/+11
|
* removed accidently added binaryRainer Gerhards2009-04-091-0/+0
|
* Merge branch 'tcpflood' into nextmasterRainer Gerhards2009-04-097-11/+342
|\ | | | | | | | | Conflicts: ChangeLog
| * minor cleanupRainer Gerhards2009-04-083-9/+1
| |
| * added new test case for many tcp connectionsRainer Gerhards2009-04-086-3/+342
| | | | | | | | | | | | | | It is checked that many tcp connections are properly handled. While adding this test, I noticed that there is a bug in imtcp that prevents creation of more than 200 connections. This bug still exists, so the test suite currently fails (what is correct). Will be addressed soon.
* | Merge branch 'master' into nextmasterRainer Gerhards2009-04-094-2/+36
|\ \ | | | | | | | | | | | | Conflicts: ChangeLog
| * \ Merge branch 'beta'Rainer Gerhards2009-04-095-1/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c tcpsrv.h Note: we have a slight inconsistency, as interface version v4 was already used for tcpsrv in this branch. We accept this inconsistency.
| | * \ Merge branch 'v3-stable' into betaRainer Gerhards2009-04-095-1/+32
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | bugfix: $InputTCPMaxSessions config directive was accepted, but not honoredRainer Gerhards2009-04-094-1/+23
| | | | | | | | | | | | | | | | | | | | This resulted in a fixed upper limit of 200 connections.
| | | * | Merge branch 'v2-stable' into v3-stableRainer Gerhards2009-04-092-0/+5
| | | |\ \
| | | | * | bugfix: potential memory leak in msg.cRainer Gerhards2009-04-092-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one did not surface yet and the issue was actually found due to a problem in v4 - but better fix it here, too.
* | | | | | 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
| | | | | | | | | |