Rainer Gerhards
08c262011d
re-enable bPrevWasSuspended handling
2013-11-06 11:06:48 +01:00
Rainer Gerhards
e51de9f416
re-enable main queue direct mode
2013-11-05 17:47:35 +01:00
Rainer Gerhards
43d922f1b1
shuffle code to be in closer proximity of related functions
2013-11-05 16:12:49 +01:00
Rainer Gerhards
c4af90f626
fix potential deadlock
2013-11-05 16:10:17 +01:00
Rainer Gerhards
d89eff5b29
rename for clarity
2013-11-05 16:10:00 +01:00
Rainer Gerhards
268bd872ed
simplify submitToActionQ...() code path
2013-11-05 16:04:27 +01:00
Rainer Gerhards
98900cfd0f
consistently use msg generation time in mark msg processing
2013-11-05 13:03:01 +01:00
Rainer Gerhards
afe2f1dc5f
refactor: simplify code path
2013-11-05 12:59:08 +01:00
Rainer Gerhards
9b2e8c53fd
refactor bShutdownImmediate handling
2013-11-05 12:24:29 +01:00
Rainer Gerhards
1142083565
refactor: move pbShutdownImmediate to wti_t
2013-11-05 08:59:42 +01:00
Rainer Gerhards
b2d69c172c
put retry processing on hold but document what we already know about it
2013-11-04 17:29:54 +01:00
Rainer Gerhards
9718fbbf0b
push bShutdownImmediate ptr down to commit process
2013-11-04 14:42:15 +01:00
Rainer Gerhards
30aece94a6
cosmetic: keep related code together
2013-11-04 14:34:20 +01:00
Rainer Gerhards
ce57131e1e
experimentally split ruleset execution in exec and commit phase
2013-11-04 14:32:49 +01:00
Rainer Gerhards
f558b07493
Merge branch 'master-ruleeng' into master-ruleeng-simd
...
Conflicts:
action.c
2013-11-04 10:40:24 +01:00
Rainer Gerhards
38ce3ef3a5
fix tryResume callback
2013-11-04 10:17:01 +01:00
Rainer Gerhards
b278457d49
refactor: move batch "unrolling" up one layer
2013-11-04 09:12:56 +01:00
Rainer Gerhards
32b37ecd82
fix async action queues
2013-11-03 10:59:34 +01:00
Rainer Gerhards
d200ef2d8b
temporarily remove bExecWhenPrevWasSuspended handling
...
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).
2013-11-02 17:43:24 +01:00
Rainer Gerhards
8878a0b1cf
re-enable state handling after endTransaction()
2013-11-02 12:30:28 +01:00
Rainer Gerhards
08e96b620e
refactor output side of action queue - main shot
...
this needs refinement, but basically we now do no longer rely on
batches for the sub-functions.
2013-11-02 12:04:33 +01:00
Rainer Gerhards
fbfc398463
refactor: move action resume retry counter to wti_t
2013-11-01 18:17:30 +01:00
Rainer Gerhards
7c74c432a7
some debug aids & useful commments for going forward
2013-11-01 18:06:58 +01:00
Rainer Gerhards
8c46d71293
refactor: move handling too-frequent tryResume == OK to wti_t
2013-11-01 17:34:38 +01:00
Rainer Gerhards
bf11ace45a
refactor: move action state to wti (as we are now on a per-thread basis)
2013-11-01 17:22:32 +01:00
Rainer Gerhards
c1fd17cc24
cosmetic: remove commented-out code
2013-11-01 16:46:11 +01:00
Rainer Gerhards
dbd0fe950a
fix v8 output interface transaction begin handling
2013-10-31 09:07:29 +01:00
Rainer Gerhards
4ac27e73af
call freeWrkrInstance() on worker thread termination
2013-10-29 18:16:57 +01:00
Rainer Gerhards
5878ee24c7
milestone: action mutex removed
...
This means actions may now be called concurrently and must make
provisions themselves to handle multi-threading.
2013-10-29 17:19:15 +01:00
Rainer Gerhards
8f27fab834
add debug output for worker actions
2013-10-29 16:52:56 +01:00
Rainer Gerhards
286bf42f61
milestone: action engine changed to partially support wrkr instance action interface
2013-10-28 16:03:32 +01:00
Rainer Gerhards
26b5341c2e
milestone: now shuffeling wti ptr correctly down to action handler
...
except if main queue is in direct mode -- this need smore work
and thinking (probably via pthreads state variables, but let's see later)
2013-10-27 10:42:49 +01:00
Rainer Gerhards
1f59e66eef
milestone: calling sequence changed so that wti is passed to many functions
2013-10-26 17:56:04 +02:00
Rainer Gerhards
efa8dfb47d
maintain action ids (actionNbr)
2013-10-26 13:54:45 +02:00
Rainer Gerhards
fbc737d650
experimental: make impstats return delta values where possible
2013-09-07 15:58:09 +02:00
Rainer Gerhards
8d4a5152cb
Merge branch 'v7-stable'
2013-09-03 11:54:20 +02:00
hwoarang
1c71b9628b
make rsyslog use the new json-c pkgconfig file if available
2013-09-03 11:38:01 +02:00
Rainer Gerhards
415b26d5a1
enable shuffling of crypto parameters down through queue definition
2013-05-10 15:39:42 +02:00
Rainer Gerhards
d0cefac7a7
cleanup
2013-04-24 11:09:37 +02:00
Rainer Gerhards
2e86f78d59
Merge branch 'v7-stable'
2013-04-12 09:13:10 +02:00
Rainer Gerhards
6773add66a
bugfix: parameter action.execOnlyWhenPreviousIsSuspended was accidently of integer-type
...
For obvious reasons, it needs to be boolean. Note that this change
can break existing configurations if they circumvented
the problem by using 0/1 values.
2013-04-12 09:12:05 +02:00
Rainer Gerhards
acd140f653
Merge branch 'c7' into tmp
...
Conflicts:
ChangeLog
configure.ac
runtime/queue.c
2013-04-09 11:29:39 +02:00
Rainer Gerhards
86e34c6985
make imrelp properly terminate on system shutdown
...
it didn't do so if it was inside a retry loop
2013-04-09 10:54:04 +02:00
Rainer Gerhards
d9cde56eb8
add output module interface to facilitate cooperative shutdown
...
... in more complex cases (where receiving SIGTTIN is not sufficient).
See also:
http://blog.gerhards.net/2013/04/rsyslog-output-plugin-wrangling.html
2013-04-08 17:55:52 +02:00
Rainer Gerhards
755b56fdf4
Merge branch 'v7-stable'
...
Conflicts:
grammar/rainerscript.c
runtime/ruleset.c
2013-04-08 09:47:32 +02:00
Rainer Gerhards
2de4a04b7e
bugfix: failover/action suspend did not work correctly
...
This was experienced if the retry action took more than one second
to complete. For suspending, a cached timestamp was used, and if the
retry took longer, that timestamp was already in the past. As a
result, the action never was kept in suspended state, and as such
no failover happened. The suspend functionalit now does no longer use
the cached timestamp (should not have any performance implication, as
action suspend occurs very infrequently).
Also added some better debug logging for the action engine.
2013-04-07 18:48:48 +02:00
Rainer Gerhards
2bf626dce2
Merge branch 'v6-stable' into tmp
2013-03-20 09:43:22 +01:00
Rainer Gerhards
cdf8b7d909
Merge branch 'v6-stable'
2013-03-12 11:33:28 +01:00
Rainer Gerhards
07e296703b
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
action.c
queue.c (some code moved from action.c --> queue.c)
2013-03-12 11:32:53 +01:00
Tomas Heinrich
bb74c4485a
bugfix: divide action queue discard mark by 10 - was out of range
2013-03-12 11:24:09 +01:00
