Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-ruleeng' into master-ruleeng-simd | Rainer Gerhards | 2013-11-05 | 5 | -4/+43 |
|\ | | | | | | | | | | | | | Conflicts: runtime/ruleset.c required refactoring of (asnyc) call code | ||||
| * | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-05 | 5 | -4/+47 |
| |\ | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | * | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-05 | 5 | -4/+47 |
| | |\ | |||||
| | | * | Merge branch 'v7-stable-call-ruleset-queue' into v7-stable | Rainer Gerhards | 2013-11-05 | 5 | -4/+47 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | | * | bugfix: call to ruleset with async queue did not use the queue | Rainer Gerhards | 2013-06-26 | 5 | -4/+46 |
| | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443 | ||||
* | | | | | support force termination in script engine | Rainer Gerhards | 2013-11-05 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | refactor: move pbShutdownImmediate to wti_t | Rainer Gerhards | 2013-11-05 | 6 | -11/+12 |
| | | | | | |||||
* | | | | | refactor: remove no longer needed elements from batch_t | Rainer Gerhards | 2013-11-04 | 2 | -5/+1 |
| | | | | | |||||
* | | | | | cleanup: multiple rulesets inside a single batch are now OK | Rainer Gerhards | 2013-11-04 | 2 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | They don't require special handling any longer, so do no longer care about them. | ||||
* | | | | | more cleanup | Rainer Gerhards | 2013-11-04 | 1 | -11/+0 |
| | | | | | |||||
* | | | | | cleanup: remove no longer needed code | Rainer Gerhards | 2013-11-04 | 1 | -55/+0 |
| | | | | | |||||
* | | | | | refactor script execution to work on one message at a time | Rainer Gerhards | 2013-11-04 | 1 | -233/+72 |
| | | | | | |||||
* | | | | | put retry processing on hold but document what we already know about it | Rainer Gerhards | 2013-11-04 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | push bShutdownImmediate ptr down to commit process | Rainer Gerhards | 2013-11-04 | 3 | -12/+19 |
| | | | | | |||||
* | | | | | cosmetic: keep related code together | Rainer Gerhards | 2013-11-04 | 1 | -16/+15 |
| | | | | | |||||
* | | | | | experimentally split ruleset execution in exec and commit phase | Rainer Gerhards | 2013-11-04 | 5 | -34/+103 |
| | | | | | |||||
* | | | | | Merge branch 'master-ruleeng' into master-ruleeng-simd | Rainer Gerhards | 2013-11-04 | 2 | -1/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c | ||||
| * | | | | fix tryResume callback | Rainer Gerhards | 2013-11-04 | 2 | -5/+8 |
| | | | | | |||||
* | | | | | refactor: move batch "unrolling" up one layer | Rainer Gerhards | 2013-11-04 | 3 | -136/+90 |
| | | | | | |||||
* | | | | | fix async action queues | Rainer Gerhards | 2013-11-03 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | remove no longer needed vars from batch structure | Rainer Gerhards | 2013-11-03 | 2 | -15/+1 |
| | | | | | |||||
* | | | | | temporarily remove bExecWhenPrevWasSuspended handling | Rainer Gerhards | 2013-11-02 | 3 | -61/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add comments on howto re-implement it inside the script engine (but we do not do this right now as we would like to do this together when we touch the script engine -- for now focussing on action handling). | ||||
* | | | | | re-enable state handling after endTransaction() | Rainer Gerhards | 2013-11-02 | 1 | -8/+0 |
| | | | | | |||||
* | | | | | refactor output side of action queue - main shot | Rainer Gerhards | 2013-11-02 | 2 | -301/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this needs refinement, but basically we now do no longer rely on batches for the sub-functions. | ||||
* | | | | | refactor: move action resume retry counter to wti_t | Rainer Gerhards | 2013-11-01 | 3 | -5/+24 |
| | | | | | |||||
* | | | | | some debug aids & useful commments for going forward | Rainer Gerhards | 2013-11-01 | 2 | -2/+24 |
| | | | | | |||||
* | | | | | refactor: move handling too-frequent tryResume == OK to wti_t | Rainer Gerhards | 2013-11-01 | 3 | -7/+24 |
| | | | | | |||||
* | | | | | refactor: move action state to wti (as we are now on a per-thread basis) | Rainer Gerhards | 2013-11-01 | 5 | -75/+88 |
| | | | | | |||||
* | | | | | cosmetic: remove commented-out code | Rainer Gerhards | 2013-11-01 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | omtesting: support v8 omod interface | Rainer Gerhards | 2013-11-01 | 1 | -1/+12 |
| | | | | |||||
* | | | | doc: omstdout now works under v8 | Rainer Gerhards | 2013-11-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | doc: omruleset now supported on v8 | Rainer Gerhards | 2013-11-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | omjournal: support v8 omod interface | Rainer Gerhards | 2013-11-01 | 2 | -1/+16 |
| | | | | |||||
* | | | | omstdout: support v8 omod interface | Rainer Gerhards | 2013-11-01 | 1 | -3/+18 |
| | | | | |||||
* | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-10-31 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/ommysql/ommysql.c | ||||
| * | | | ommysql cosmetic: change some historic names | Rainer Gerhards | 2013-10-31 | 1 | -21/+21 |
| | | | | |||||
| * | | | doc: add missing ChangeLog entry | Rainer Gerhards | 2013-10-31 | 1 | -0/+1 |
| | | | | |||||
* | | | | ommysql cosmetic: change some historic names | Rainer Gerhards | 2013-10-31 | 1 | -36/+36 |
| | | | | |||||
* | | | | omruleset: make work with v8 omod interface | Rainer Gerhards | 2013-10-31 | 1 | -3/+14 |
| | | | | |||||
* | | | | module omruleset is no longer enabled by default. | Rainer Gerhards | 2013-10-31 | 2 | -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 interface | Rainer Gerhards | 2013-10-31 | 7 | -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 interface | Rainer Gerhards | 2013-10-31 | 2 | -54/+62 |
| | | | | |||||
* | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-10-31 | 2 | -8/+5 |
|\| | | | |||||
| * | | | bugfix: ommysql lost configfile/section parameters after first close | Rainer Gerhards | 2013-10-31 | 2 | -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 interface | Rainer Gerhards | 2013-10-31 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | Note that this module is deprecated and only the bare necessary things are done. | ||||
* | | | | ompipe: make play well with v8 output module interface | Rainer Gerhards | 2013-10-31 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-10-31 | 1 | -1/+2 |
|\| | | | |||||
| * | | | doc: update ChangeLog | Rainer Gerhards | 2013-10-31 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-29 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | prepare for 7.4.6 releasev7.4.6 | Rainer Gerhards | 2013-10-29 | 3 | -3/+3 |
| | | | |