44 Commits

Author SHA1 Message Date
Thomas Deutschmann
d5ffe6e10e
build system: don't link liblogging-stdlog when available but not enabled
When liblogging-stdlog was available but configure option "--disable-liblogging-stdlog"
was set, rsyslog was still linking against liblogging-stdlog.

This commit will ensure that rsyslog will only link against liblogging-stdlog when
"--enable-liblogging-stdlog" was set.

Bug: https://bugs.gentoo.org/667836
2018-11-03 23:21:29 +01:00
PascalWithopf
19133327cc correct codestyle in rsyslog 2018-07-31 09:44:27 +02:00
Rainer Gerhards
7361603175 refactor core to unify random number generation
this is a step forward, but not everything yet done. Nevertheless
useful in itself.
2017-12-06 13:58:58 +01:00
Rainer Gerhards
9b82943ab4 omtesting: another try at silencing Coverity scan
If it doesn't work out, we'll disable it via the user interface
2017-10-30 19:05:41 +01:00
Rainer Gerhards
5204a7faf9 omtesting: flag use of rand() function as intentional (for Coverity)
CID 185374
2017-10-30 11:36:33 +01:00
Tomas Heinrich
1059165690 omtesting: fix unit labels 2015-09-03 16:53:09 +02:00
Chris Hiszpanski
20d869968b Added LIBLOGGING_STDLOG_CFLAGS and LIBLOGGING_STDLOG_LIBS to automake sources
Build was failing when using these variables
2014-09-25 05:06:57 -07:00
Rainer Gerhards
576365752a omtesting: fix for multiple worker threads was incomplete 2013-12-05 16:26:18 +01:00
Rainer Gerhards
f66dbcd7fe omtesting: fix potential problem when multiple worker instances 2013-12-05 15:47:05 +01:00
Rainer Gerhards
6b8755be22 omtesting: support v8 omod interface 2013-11-01 12:04:49 +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
2f5aec47db remove pData from tryResume callback 2013-10-30 18:22:03 +01:00
Rainer Gerhards
84537ced75 milestone: make default modules compile again (but they do NOT work!) 2013-10-27 11:40:52 +01:00
Rainer Gerhards
d9df6e9775 bugfix: modules not (yet) supporting new conf format were not properly registered
This lead to a "module not found" error message instead of
the to-be-expected "module does not support new style" error message.
That invalid error message could be quite misleading and actually stop
people from addressing the real problem (aka "go nuts" ;))
2012-11-28 10:02:08 +01:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c
2012-01-19 13:07:46 +01:00
Rainer Gerhards
9b24152b6a undoing v6.1 config scoping interface, part I
The most common files are now changed, more needs to be done.
2012-01-18 18:21:08 +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
fe4cfa6d1f Merge branch 'v5-stable' into v6-stable
Conflicts:
	plugins/imtcp/imtcp.c
2012-01-14 18:35:09 +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
0216053099 relicense parts under ASL 2.0
after carful check for copyright holder
2012-01-11 18:30:33 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +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
bcc3b2aef7 Merge branch 'v5-devel'
Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c
2010-12-17 13:20:55 +01:00
Rainer Gerhards
7817aa1597 bugfix: unitialized variable could cause issues under extreme conditions
plus some minor nits. This was found after a clang static code analyzer
analysis (great tool, and special thanks to Marcin for telling me about
it!)
2010-12-16 12:02:36 +01: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
e64cd21243 moving towards scoping inside rsyslog.conf
first step: adding object-type specifier to config statement table
2010-07-21 18:08:19 +02:00
Rainer Gerhards
f3884d5262 ensure proper imudp shutdown even on a very busy system 2009-10-16 09:18:51 +02:00
Rainer Gerhards
9e1bb31a4d fixed some bugs & added testing helpers
The action state machine now works correctly and has been verified a
few hand-picked cases. I am missing automatted tests, though, this is
not easy to achive... Anyhow, I've improved omtesting, so that it can
be used in such automatted tests.
2009-05-07 13:37:25 +02:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
2009-02-24 13:09:44 +01:00
Michael Biebl
b6b53972e1 Remove .cvsignore files, add .gitignore.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-06-11 17:03:47 +02:00
Rainer Gerhards
d9b0c77d3e some more cleanup
reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear
2008-04-16 15:27:53 +02:00
Rainer Gerhards
d7f33053da made everything compile with the new runtime subdirectory 2008-04-16 08:42:00 +02:00
Rainer Gerhards
cdcc0e6710 removed a now-longer needed callback from the output module interface.
Results in reducing code complexity.
2008-03-22 10:30:40 +00:00
Rainer Gerhards
28dcc746bd applied patch from Michael Biebl to clean up build system 2008-03-06 07:39:32 +00:00
Rainer Gerhards
bc7d8ccebb - changed module interface to support querying obj interface (stage work)
- changed module interface version, as the interface change is quite large
2008-03-04 10:27:45 +00:00
Rainer Gerhards
c9430404db - begun to permit queue to terminate without being drained
- fixed a starvation condition in queueWorker (pthread_yield() was needed)
    could not be seen with any previously released code, came up during new
    development
2008-01-11 09:53:53 +00:00
Rainer Gerhards
e27555c468 added --enable-mudflap ./configure option 2008-01-08 16:13:42 +00:00
Rainer Gerhards
fc761b9fdc applied Michael Biebl's patch to clean up the makefiles 2008-01-03 14:08:58 +00:00
Rainer Gerhards
dd4dedbc38 created omtesting, a debug and development aid output module. This is stage
work for the new queueing engine - we need a way to delay rule
    execution and that's what the module currently does ;)
2007-12-31 12:54:03 +00:00