50 Commits

Author SHA1 Message Date
Rainer Gerhards
23fba16dca Merge branch 'v7-stable'
Conflicts:
	tools/ompipe.c
2014-03-25 15:28:59 +01:00
Rainer Gerhards
094c9e9626 bugfix: ompipe used invalid default template
This is a regression from an old change (didn't track it down precisely,
but over a year ago). It used the Forwarding template instead of
the file template (so we have a full syslog header). This fix corrects
it back to previous behaviour, but new scripts that used the wrong
format may now need to have the RSYSLOG_ForwardingFormat template
explicitely be applied.
closes: https://github.com/rsyslog/rsyslog/issues/50
2014-03-25 15:24:49 +01:00
Rainer Gerhards
7ef8e5d78d fix missing argument
unfortunately, during cleanup of code for
https://github.com/rsyslog/rsyslog/issues/35
I removed a bit too much and noticed the compiler warning
too late.
2014-03-25 15:19:42 +01:00
Rainer Gerhards
a79b07fcd2 bugfix: ompipe did emit many suspension messages for /dev/xconsole
(hopefully now) closes: https://github.com/rsyslog/rsyslog/issues/35
When it was present, but nobody reading from it. The problem
is the way the rsyslog v7 engine tries to resolve failures in outputs.
It does some retries, and along those lines some state information gets
lost and it is close to impossible to retain it. However, the actual
root problem is that ompipe does not reliably detect if it is able to
recover. The problem here is that it actually does not know this
before it does an actual write. These two things together mess up the
logic that suppresses invalid resumption/suspension messages
(actually, the plugin switches state really that often).
Nevertheless, the prime problem with /dev/xconsole (and probably
most other pipes as well) is that it gets full. So I have now added
code that checks, during resume processing, if the pipe is writable.
If it is not, resume is deferred. That should address the case.
2014-03-25 15:12:14 +01:00
Rainer Gerhards
68710a4068 fix broken build process due to imported patch
I obviously did not check carefully enough the results of
that import. Thanks to Tomas Heinrich for alerting us, see:
https://github.com/rsyslog/rsyslog/issues/35#issuecomment-36146610

NOTE: this problems was not in released code, "just" the git tree.
2014-02-26 18:07:30 +01:00
Rainer Gerhards
bda7b6db47 Merge branch 'v7-stable' 2014-02-23 12:45:43 +01:00
Rainer Gerhards
df77823d71 bugfix: ompipe did resume itself even when it was still in error
See: https://github.com/rsyslog/rsyslog/issues/35
Thanks to github user schplat for reporting
2014-02-23 12:42:16 +01:00
Rainer Gerhards
790ed9f8a0 Merge branch 'v7-stable'
Conflicts:
	tools/omfile.c
2014-02-23 12:35:02 +01:00
Rainer Gerhards
26f07e7597 typo fix
Thanks to github user schplat for alerting us.
See (embedded in larger issue): https://github.com/rsyslog/rsyslog/issues/35
2014-02-23 12:30:48 +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
b44dcabe90 remove pData emulation from v8 omod interface
breaks compilation of not converted modules - but these
won't work anyways. So better change this now.
2013-10-31 18:15:33 +01:00
Rainer Gerhards
17e8ec1596 ompipe: make play well with v8 output module interface 2013-10-31 11:16:55 +01:00
Rainer Gerhards
64a4358384 add freeWrkrInstance to output module interface 2013-10-29 16:17:46 +01:00
Rainer Gerhards
1960b94b8a move all builtin-modules to new wrkr activation interface; make this mandatory
This intentionally breaks build of modules not yet converted.
2013-10-29 10:56:13 +01:00
Rainer Gerhards
84537ced75 milestone: make default modules compile again (but they do NOT work!) 2013-10-27 11:40:52 +01:00
eea77a5bf6 Using OMSRsetEntry to set the default action template in ompipe for now.
If no default template is set, a segfault occured on startup.
2013-08-06 11:29:33 +02:00
Rainer Gerhards
e5ef73eb25 bugfix: invalid rsyslog-internal macro API use
This had no bad effect, because the macro did the same as the one
that should have been used.
2012-11-01 17:05:07 +01:00
Rainer Gerhards
5de5166e44 ompipe: fix copy&paste name errors 2012-06-25 17:42:41 +02:00
Rainer Gerhards
e9ad3cafd1 ompipe: support for module() global config parameters added 2012-06-25 17:21:17 +02:00
Rainer Gerhards
6ff5f6d239 ompipe: cosmetic, rename var 2012-01-27 12:06:14 +01:00
Rainer Gerhards
532d6994df ompipe: support for v6 config system added 2012-01-27 12:05:40 +01:00
Rainer Gerhards
b68af9a016 cosmetic: remove compiler warnings 2012-01-19 15:41:49 +01:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master
Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c
2012-01-18 14:08:24 +01:00
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
2012-01-14 18:32:40 +01:00
Rainer Gerhards
e335a65788 more license analysis & change 2012-01-14 18:01:12 +01:00
Rainer Gerhards
6d3cc9e406 Merge branch 'v4-stable' into v5-stable
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/parser.c
	runtime/rsyslog.h
	tests/Makefile.am
	tests/tcpflood.c
2011-09-22 12:20:27 +02:00
Rainer Gerhards
1d0e4ba3b3 Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable 2011-09-15 15:17:47 +02:00
Andrew Stothard
b7e69a2400 typo fix 2011-09-15 15:17:09 +02:00
Rainer Gerhards
9ce9fbb28f milestone: new output plugin interface call added 2011-07-21 11:14:52 +02:00
Rainer Gerhards
c6fc7f5ba3 merge fix: made mistake when merging in v5-devel changes, now fixing 2011-04-27 18:07:14 +02:00
Rainer Gerhards
df5c3b8cdd Merge branch 'v5-devel'
Conflicts:
	tools/omfile.c
2011-04-26 18:45:12 +02:00
Rainer Gerhards
415b95cf45 bugfix: pipes not opened in full priv mode when privs are to be dropped 2011-04-26 18:38:42 +02:00
Rainer Gerhards
bbe1f2688c renaming conf.* wasn't a good idea -- undoing
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741 renamed conf.c to legacyconf.c to make room for new config system 2011-04-19 07:53:23 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
2011-03-11 10:24:58 +01:00
Bojan Smojver
d1eb6e0edc added work-around for bug in gtls, which causes fd leak when using TLS
The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-23 11:25:43 +01:00
Rainer Gerhards
b8ffbecb78 Merge branch 'v5-devel' 2010-10-22 20:19:06 +02:00
Rainer Gerhards
ed36822e37 Merge branch 'v4-stable' into v5-stable
Conflicts:

	configure.ac
	runtime/cfsysline.c
	tools/ompipe.c
2010-10-19 12:54:38 +02:00
Rainer Gerhards
ec339c9097 Merge branch 'v4-stable' into v4-devel
Conflicts:

	runtime/cfsysline.c
	tools/ompipe.c
2010-10-19 12:44:22 +02:00
Rainer Gerhards
0a24b3afc0 fixing some compile problems on FreeBSD 2010-10-19 12:39:48 +02:00
Rainer Gerhards
d460c1cd5d fixed regression from last commit
config variables were not properly initialized
2010-07-27 11:38:25 +02:00
Rainer Gerhards
d18b238f16 milestone commit: output plugin interface changes (may NOT run)
The output interface has been changed, but we do not yet utilize the
new interface. Also, it looks like a regression was introduced. But before
hunting it down, I'd like to make a commit (what also easys the regresion
hunt).
2010-07-27 09:44:35 +02:00
Rainer Gerhards
d3eb89a5fe Merge branch 'v4-devel' into master
Conflicts:
	runtime/msg.h
2010-04-19 17:13:08 +02:00
Rainer Gerhards
393c67ba5b minor cleanup 2010-04-19 15:38:11 +02:00
Rainer Gerhards
4e511087c4 some cleanup 2010-04-19 15:21:25 +02:00
Rainer Gerhards
2a494ffc41 added include needed for Solaris 2010-03-02 10:18:33 +01:00
Rainer Gerhards
2c39f76037 make $ActonFileDefaultTemplate available to ompipe
This was not honored by the new ompipe module, because it is a local
file directive (it was applied to pipes as a side-effect of using the
same module for pipes and files...). I now made this a global, so that
semantics are the same as previously. Not really nice, but probably
the best thing to do in the current situation (everything else would
involve much more overhead --- leave that for the new config system).
2010-03-01 07:33:09 +01:00
Rainer Gerhards
791d8ea863 some code cleanup 2010-02-28 17:28:52 +01:00
Rainer Gerhards
50636ba267 moved pipe code to its own module
... based on old omfile. Michael Biebl reported that xconsole seems
to have some issues with the new pipe code, so it was best to use
the old code for pipes. The optimizations were done to speed up file
access, so it doesn't really matter pipes do not receive them.
2010-02-28 17:18:04 +01:00