rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 12:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,520 Commits 67 Branches 505 Tags
Commit Graph

420 Commits

Author SHA1 Message Date
Rainer Gerhards
0439592567 Merge branch 'v7-stable' into v8-stable 2014-07-11 12:56:21 +02:00
Rainer Gerhards
e61d8a88d0 Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable 2014-07-11 12:47:23 +02:00
Rainer Gerhards
df2d8de8c4 fix inconsistent write/deref in action config processing 
Thanks to Tomas Heinrich for alerting us.
 2014-07-11 12:46:56 +02:00
Rainer Gerhards
ff4213524c Merge branch 'v7-stable' into v8-stable 
Conflicts:
	action.c
 2014-07-11 12:19:41 +02:00
Rainer Gerhards
089a7ba9f2 unpick commit 5c4cb78ac15e841726af672a8a227017a2516cfa 
The variable initialized there was removed by my larger patch
a couple of days ago. Accidently cherry-picked that commit.
 2014-07-11 11:53:16 +02:00
Tomas Heinrich
1267ee2879 Set default value of eParamPassing explicitly 2014-07-11 11:50:27 +02:00
Tomas Heinrich
ba4cc3298c bugfix: add a missing flag and prevent memleak 2014-07-11 11:49:22 +02:00
Tomas Heinrich
b43b16901e bugfix: correct variable mismatch 2014-07-11 11:49:22 +02:00
Tomas Heinrich
28277f723e bugfix: don't export uninitialized data 2014-07-11 11:49:22 +02:00
Tomas Heinrich
dcb201eae6 bugfix: remove duplicate code 2014-07-11 11:49:22 +02:00
Rainer Gerhards
15c051dfb6 Merge branch 'v7-stable' into v8-stable 2014-07-11 09:27:58 +02:00
Rainer Gerhards
499b3c7426 fix small memleak in action() 
This was introduced by a recent patch. Not present in any
released version.
 2014-07-11 09:27:30 +02:00
Rainer Gerhards
62c26362b3 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	action.c

I needed to adopt the v7 changes to the new non-batch inner
processing. This may have some bug potential.
 2014-07-10 19:42:57 +02:00
Rainer Gerhards
cda27324b8 bugfix: output modules with parameters with multiple passing modes could cause strange behaviour including aborts 
This was due to the fact that the action module only preserved and
processed the last set passing mode. Note that this was not a problem
for the plugins provided by the rsyslog git: none of them uses different
passing modes.
Thanks to Tomas Heinrich for providing a very detailled bug report.
 2014-07-06 17:48:30 +02:00
Rainer Gerhards
30c8c4bdb1 Merge branch 'v7-stable' into master-merge 
This was a rather complicated merge as we needed to migrate some
per-action settings (v7) to action instance settings (v8).

Conflicts:
	action.c
	action.h
	doc/global.html
	runtime/glbl.c
 2014-03-03 15:49:01 +01:00
Rainer Gerhards
1b29f59615 add global and action-parameter action.reportSuspensionContinuation 2014-03-01 11:30:04 +01:00
Rainer Gerhards
142332e227 bugfix: invalid error number was logged 2014-02-28 14:09:40 +01:00
Rainer Gerhards
2ed88403e8 emit "action resumed" message only when the resume was actually successful 2014-02-28 12:59:07 +01:00
Rainer Gerhards
9830565917 Merge branch 'v7-stable' into master-upmerge 
Conflicts:
	action.c
	action.h
 2014-02-27 18:42:30 +01:00
Rainer Gerhards
fa5f2aab10 added "action.reportSuspension" action parameter 
This now permits to control handling on a per-action basis rather to
the previous "global setting only".
 2014-02-27 18:32:13 +01:00
Rainer Gerhards
6f2be18a3c Merge branch 'v7-stable' 
Conflicts:
	action.h
 2014-02-23 12:22:28 +01:00
Rainer Gerhards
738e58dcf6 bugfix: "action xxx suspended" did report incorrect error code 2014-02-23 12:18:02 +01:00
Rainer Gerhards
87c639fb93 "action resumed" message now also specifies module type 
which makes troubleshooting a bit easier. Note that we cannot output all
the config details (like destination etc) as this would require much more
elaborate code changes, which we at least do not like to do in the
stable version.
 2014-02-23 12:13:20 +01:00
Rainer Gerhards
28b7608b82 better and more consistent action object naming 
action queues now always contain the word "queue" after the action name
 2014-02-23 11:46:36 +01:00
Rainer Gerhards
3c70cf1dd9 bugfix: end of batch processing was not 100% correct. 
Could lead to outputs not properly wirting messages. At least
omelasticsearch did not write anything to the database due to this bug.
See: https://github.com/rsyslog/rsyslog/issues/10
Thanks to Radu Gheorghe for reporting the issue.
 2014-02-19 14:48:34 +01:00
Rainer Gerhards
09313132ee cleanup 2013-12-07 18:50:57 +01:00
Rainer Gerhards
61afef5522 properly handle suspension in commitTransaction() processing 2013-12-07 18:49:03 +01:00
Rainer Gerhards
bd74a861fe cosmetic: remove already done TODO 2013-12-07 17:47:23 +01:00
Rainer Gerhards
3f18e9366f bugfix: action commitTransaction() processing did not properly handle suspended actions 2013-12-07 17:31:51 +01:00
Rainer Gerhards
15c8faa726 refactor: remove duplicate code 2013-12-06 11:07:32 +01:00
Rainer Gerhards
ff59105c84 cleanup 2013-12-06 10:53:46 +01:00
Rainer Gerhards
2c852d0ebc action suspension fix is OK - cleanup 
also added some qualifiers...
 2013-12-06 09:15:27 +01:00
Rainer Gerhards
809e817ed3 experimental fix for action suspension state 2013-12-06 08:50:38 +01:00
Rainer Gerhards
f3a24bebc8 refactor fix: correctly handle non-transactional omods and empty transactions 2013-12-05 12:14:30 +01:00
Rainer Gerhards
2315b19b0e do not call new transaction interface if no message is to be processed 2013-12-05 09:53:02 +01:00
Rainer Gerhards
21d265bd84 regression fix: another address miscalculation fixed 2013-12-05 07:58:56 +01:00
Rainer Gerhards
6ee2dc5ddd do no longer use void* ptr in iparams as we know we deal with strings 2013-12-04 16:57:42 +01:00
Rainer Gerhards
4695ab7c3e refactor output system string handling 2013-12-04 16:49:22 +01:00
Rainer Gerhards
7fcecd43f3 remove unnecessary function call 2013-12-04 12:47:39 +01:00
Rainer Gerhards
fb6dd02afc refactor milestone: create first PoC of commitTransaction() entry point 2013-12-04 11:38:07 +01:00
Rainer Gerhards
41a3489b70 refactor milestone: prep iparam structure for omod interface usage 2013-12-04 10:29:13 +01:00
Rainer Gerhards
be36ef5009 refactor doAction omod interface 
we do no longer support the iMsgOpts parameter
 2013-12-04 09:24:11 +01:00
Rainer Gerhards
0124b34d4e check that transaction output modules actuall use string passing 
This is now required by the output module interface - else we can
not guarantee correctness (even in v7, we could not do that...).
 2013-12-03 18:01:30 +01:00
Rainer Gerhards
22efa385ea some more qualifier work... 2013-12-03 17:13:13 +01:00
Rainer Gerhards
3b523a196a reduced number of malloc/frees during string template processing 
We now re-use once allocated string template memory for as long
as the worker thread exists. This saves us from doing new memory
allocs (and their free counterpart) when the next message is
processed. The drawback is that the cache always is the size of
the so-far largest message processed. This is not considered a
problem, as in any case a single messages' memory footprint should
be far lower than that of a whole set of messages (especially on
busy servers).
 2013-12-03 17:03:22 +01:00
Rainer Gerhards
a16113442e cleanup 2013-12-03 15:06:49 +01:00
Rainer Gerhards
dc84772973 refactor: shrink template string structures 2013-12-03 14:10:51 +01:00
Rainer Gerhards
a4213cc2b6 another round of const qualifiers... 2013-12-03 12:56:17 +01:00
Rainer Gerhards
8fde715ab4 do not free never-assigned template strings 2013-12-03 12:28:26 +01:00
Rainer Gerhards
9cc097832b failed action detection more precisely for a number of actions 
If an action  uses string parameter passing but is non-transactional
it can be executed immediately, giving a quicker indicatio of
action failure.
 2013-12-03 10:20:45 +01:00