summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into master-ruleengRainer Gerhards2013-11-063-17/+16
|\
| * cleanup unreachable codeRainer Gerhards2013-11-061-7/+1
| |
| * omudpspoof: cleanup code that could never executeRainer Gerhards2013-11-061-5/+1
| |
| * Merge branch 'v7-stable'Rainer Gerhards2013-11-061-5/+14
| |\
| | * doc: describe failover action precisenessRainer Gerhards2013-11-061-5/+14
| | |
* | | Merge branch 'master' into master-ruleengRainer Gerhards2013-11-053-7/+23
|\| |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-11-052-6/+15
| |\|
| | * improved checking of queue config parameters on startupRainer Gerhards2013-11-052-6/+8
| | |
| | * emit warning message if queue.size is set dangerously lowRainer Gerhards2013-11-051-0/+7
| | |
| * | doc: amend queue parameter doc with live web linkRainer Gerhards2013-11-051-1/+4
| | |
| * | doc: clarify lower limit of queue.size parameterRainer Gerhards2013-11-051-1/+5
| | |
* | | Merge branch 'master' into master-ruleengRainer Gerhards2013-11-055-4/+47
|\| | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| * | Merge branch 'v7-stable'Rainer Gerhards2013-11-055-4/+47
| |\|
| | * Merge branch 'v7-stable-call-ruleset-queue' into v7-stableRainer Gerhards2013-11-055-4/+47
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * bugfix: call to ruleset with async queue did not use the queueRainer Gerhards2013-06-265-4/+46
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
* | | | fix tryResume callbackRainer Gerhards2013-11-042-5/+8
| | | |
* | | | omtesting: support v8 omod interfaceRainer Gerhards2013-11-011-1/+12
| | | |
* | | | doc: omstdout now works under v8Rainer Gerhards2013-11-011-1/+1
| | | |
* | | | doc: omruleset now supported on v8Rainer Gerhards2013-11-011-1/+1
| | | |
* | | | omjournal: support v8 omod interfaceRainer Gerhards2013-11-012-1/+16
| | | |
* | | | omstdout: support v8 omod interfaceRainer Gerhards2013-11-011-3/+18
| | | |
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-311-0/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/ommysql/ommysql.c
| * | | ommysql cosmetic: change some historic namesRainer Gerhards2013-10-311-21/+21
| | | |
| * | | doc: add missing ChangeLog entryRainer Gerhards2013-10-311-0/+1
| | | |
* | | | ommysql cosmetic: change some historic namesRainer Gerhards2013-10-311-36/+36
| | | |
* | | | omruleset: make work with v8 omod interfaceRainer Gerhards2013-10-311-3/+14
| | | |
* | | | module omruleset is no longer enabled by default.Rainer Gerhards2013-10-312-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Note that it has been deprecated in v7 and been replaced by the "call" statement. Also, it can still be build without problems, the option must just explicitely be given.
* | | | remove pData emulation from v8 omod interfaceRainer Gerhards2013-10-317-6/+13
| | | | | | | | | | | | | | | | | | | | breaks compilation of not converted modules - but these won't work anyways. So better change this now.
* | | | ommysql: add support for v8 output module interfaceRainer Gerhards2013-10-312-54/+62
| | | |
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-312-8/+5
|\| | |
| * | | bugfix: ommysql lost configfile/section parameters after first closeRainer Gerhards2013-10-312-8/+5
| | | | | | | | | | | | | | | | | | | | This means that when a connection was broken, it was probably re-instantiated with different parameters than configured.
* | | | omshell: make play well with v8 output module interfaceRainer Gerhards2013-10-311-5/+2
| | | | | | | | | | | | | | | | | | | | Note that this module is deprecated and only the bare necessary things are done.
* | | | ompipe: make play well with v8 output module interfaceRainer Gerhards2013-10-311-0/+6
| | | |
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-311-1/+2
|\| | |
| * | | doc: update ChangeLogRainer Gerhards2013-10-311-0/+1
| | | |
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-10-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | prepare for 7.4.6 releasev7.4.6Rainer Gerhards2013-10-293-3/+3
| | | |
* | | | omfile: small aid for debug testingRainer Gerhards2013-10-311-3/+3
| | | |
* | | | doc: mention which modules are not supported in v8Rainer Gerhards2013-10-311-17/+17
| | | |
* | | | fix v8 output interface transaction begin handlingRainer Gerhards2013-10-312-16/+28
| | | |
* | | | dev doc: add some info on how to access ES for testingRainer Gerhards2013-10-301-0/+4
| | | |
* | | | remove pData from tryResume callbackRainer Gerhards2013-10-303-5/+4
| | | |
* | | | omelasticsearch: upgrade to v8 ouptut module interfaceRainer Gerhards2013-10-302-100/+123
| | | | | | | | | | | | | | | | Note that this code here has NOT yet been tested.
* | | | doc: clarify rulesets and main queuesRainer Gerhards2013-10-301-0/+9
| | | |
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-301-0/+8
|\| | |
| * | | build system: add missing doc filest to tarballRainer Gerhards2013-10-301-0/+7
| | | | | | | | | | | | | | | | Thanks to Pavel Levshin for alerting us on the missing files.
| * | | build: add mmsequence to doc set in tarballRainer Gerhards2013-10-301-0/+1
| | | |
* | | | call freeWrkrInstance() on worker thread terminationRainer Gerhards2013-10-293-8/+25
| | | |
* | | | milestone: action mutex removedRainer Gerhards2013-10-293-31/+12
| | | | | | | | | | | | | | | | | | | | This means actions may now be called concurrently and must make provisions themselves to handle multi-threading.
* | | | add debug output for worker actionsRainer Gerhards2013-10-293-1/+3
| | | |