| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-07 | 9 | -27/+43 |
| |\ | | | | | | | | | | | Conflicts: runtime/wti.c runtime/wti.h | ||||
| | * | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-07 | 1 | -6/+12 |
| | | | |||||
| | * | bugfix: regular workers are no longer started if DA worker is active | Pavel Levshin | 2013-11-07 | 1 | -8/+7 |
| | | | | | | | | | | | form mail: Look, below, if it is time to activate DA worker, we call it explicitly. But in this case we do not advise regular workers. They are likely already running at this point, but it is not guaranteed. What if, for example, the system is set to start additional workers when the queue is going over high watermark? What if HighWatermark is set to 1? Regular workers will not be started, and DA worker may fail. Thus, it is reasonable to advise regular workers even if we are going DA. | ||||
| | * | cleanup no longer needed code | Rainer Gerhards | 2013-11-07 | 4 | -8/+1 |
| | | | |||||
| | * | Merge branch 'master' into master-newwtipool | Rainer Gerhards | 2013-11-07 | 3 | -2/+5 |
| | |\ | |||||
| | | * | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-07 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | do not adjust batch size for disk queues | Rainer Gerhards | 2013-11-07 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | do not complain for queue size on DA queues | Rainer Gerhards | 2013-11-07 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | cosmetic: add test headers to some tests | Rainer Gerhards | 2013-11-07 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | actually a bit more than cosmetic - makes it easier to see what failed | ||||
| | | * | | do not adjust batch size for disk queues | Rainer Gerhards | 2013-11-07 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | do not complain for queue size on DA queues | Rainer Gerhards | 2013-11-06 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | doc: mention Pavel's improvement in ChangeLog | Rainer Gerhards | 2013-11-06 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | improve worker thread pool handling | Pavel Levshin | 2013-11-06 | 4 | -6/+15 |
| | |/ / | | | | | | | | | | | | | among others, make possible that workers really timeout and the pool thus shrinks | ||||
| * | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-06 | 3 | -17/+16 |
| |\| | | |||||
| | * | | cleanup unreachable code | Rainer Gerhards | 2013-11-06 | 1 | -7/+1 |
| | | | | |||||
| | * | | omudpspoof: cleanup code that could never execute | Rainer Gerhards | 2013-11-06 | 1 | -5/+1 |
| | | | | |||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-06 | 1 | -5/+14 |
| | |\| | |||||
| | | * | doc: describe failover action preciseness | Rainer Gerhards | 2013-11-06 | 1 | -5/+14 |
| | | | | |||||
| * | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-05 | 3 | -7/+23 |
| |\| | | |||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-05 | 2 | -6/+15 |
| | |\| | |||||
| | | * | improved checking of queue config parameters on startup | Rainer Gerhards | 2013-11-05 | 2 | -6/+8 |
| | | | | |||||
| | | * | emit warning message if queue.size is set dangerously low | Rainer Gerhards | 2013-11-05 | 1 | -0/+7 |
| | | | | |||||
| | * | | doc: amend queue parameter doc with live web link | Rainer Gerhards | 2013-11-05 | 1 | -1/+4 |
| | | | | |||||
| | * | | doc: clarify lower limit of queue.size parameter | Rainer Gerhards | 2013-11-05 | 1 | -1/+5 |
| | | | | |||||
| * | | | 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 | ||||
| * | | | | fix tryResume callback | Rainer Gerhards | 2013-11-04 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |