116 Commits

Author SHA1 Message Date
Rainer Gerhards
4fcfea31e3 milestone/[NONWORKING]: first integration of new parser, rules are not yet handled 2011-07-06 11:32:54 +02:00
Rainer Gerhards
2b9e5ac193 added a first implementation of a DNS name cache
this still has a couple of weaknesses, like no size limit, no expiration
of entries, suboptimal algorithms -- but it should perform better than
what we had previously. Implementation will be improved based on
feedback during the next couple of releases
2011-06-06 16:41:55 +02:00
Rainer Gerhards
c0d1334f6e step: imtcp moved to new config interface
as far as we know that new interface right now ;)
2011-05-05 11:36:05 +02:00
Rainer Gerhards
115b15a568 shuffled even more config code from syslgod to config handler 2011-04-26 17:10:36 +02:00
Rainer Gerhards
f72bde2f70 milestone: templates are now in config object 2011-04-19 09:43:36 +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
cbfa21f823 mmnormalize loads & runs (basic testing done) 2010-12-01 09:37:13 +01:00
Rainer Gerhards
44300ddcb2 Merge branch 'v5-beta' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h
2010-11-25 17:43:51 +01:00
Rainer Gerhards
a3c81f500a bugfix: replacements for atomic operations for non-int sized types had problems.
At least one instance of that problem could potentially lead
to abort (inside omfile).
2010-11-25 17:20:55 +01:00
Rainer Gerhards
e40cb595a2 omhdfs: support for HUP added 2010-10-04 13:58:41 +02:00
Rainer Gerhards
c7e36e6b7e build system: fixed some minor issues 2010-09-28 18:12:40 +02:00
Rainer Gerhards
d748c68c09 added some generic hashtable code by Christopher Clark
found at http://www.cl.cam.ac.uk/~cwc22/hashtable/
2010-09-28 11:32:48 +02:00
Rainer Gerhards
e86cb62f12 improved statistics-gathering subsystem
... well, actually this is a first real implementation of this subsystem.
I have added a counter registry, a way to access the countres (as readable
string) and a way to define and maintem them. Also, module impstats has
been updated to utilize the new system. Finally, I added some counters. I
hope that this sets the baseline for useful future enhancements.
2010-09-13 15:43:56 +02:00
Rainer Gerhards
21a2672222 moved systemd interface to rsyslog convenience lib
Mostly a refresh of sd-daemon.[ch] from its source plus some make file changes.
We now have systemd interfaces inside rsyslog, so that all plugins interested can
call the interfaces. Seems not to be totally necessary right now, but will help
in the long term.
2010-09-08 12:46:03 +02:00
Lennart Poettering
4132799268 acquire /dev/log socket optionally from systemd 2010-09-07 13:06:04 +02:00
Rainer Gerhards
527bfcea5c first implementation of strgen interface
and a first built-in strgen module. Some tweaks and more default strgens
are needed, but the code doesn't look too bad ;)
2010-06-01 18:51:55 +02:00
Rainer Gerhards
4a5a3196fb Merge branch 'v4-devel' into master
Conflicts:
	runtime/Makefile.am
	runtime/atomic.h
	runtime/queue.c
	runtime/queue.h
	runtime/wti.c
	runtime/wti.h
	runtime/wtp.c
	runtime/wtp.h
2010-04-27 17:49:06 +02:00
Rainer Gerhards
cbe2e3d444 bugfix: problems with atomic operations emulation
replaced atomic operation emulation with new code. The previous code
seemed to have some issue and also limited concurrency severely. The
whole atomic operation emulation has been rewritten.
2010-04-27 17:31:28 +02:00
Rainer Gerhards
25bc3b2e30 Merge branch 'v4-stable-solaris' into v4-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/omfile.c
	tools/syslogd.c
2010-04-12 09:10:19 +02:00
Rainer Gerhards
8f0a8076cc Merge branch 'beta' into master
Conflicts:
	ChangeLog
	configure.ac
	plugins/imudp/imudp.c
	runtime/stream.h
	tests/Makefile.am
	tests/diag.sh
	tools/omfile.c
2010-04-09 13:00:56 +02:00
Rainer Gerhards
87a957b0f5 Merge branch 'v4-stable-solaris' into beta
Conflicts:
	runtime/Makefile.am
	runtime/rsyslog.c
	tests/nettester.c
	tools/syslogd.c
2010-04-09 12:27:59 +02:00
Rainer Gerhards
072fc663a8 added replacements for atomic instructions on systems that do not support them.
[backport of Stefen Sledz' patch for v5]
2010-03-23 15:04:24 +01:00
Steffen Sledz
a61e164a97 emulate missing atomic builtins with posix semaphores if available
Signed-off-by: Steffen Sledz <sledz@dresearch.de>
Acked-by: Thilo Fromm <t.fromm@dresearch.de>
2010-03-23 11:11:30 +01:00
Rainer Gerhards
c82f2781d2 added skeleton for supporting epoll() API in netstream subsystem 2009-11-18 14:16:08 +01:00
Rainer Gerhards
0957820a10 Merge branch 'v4-devel'
Conflicts:
	doc/rsyslog_conf_modules.html
	gss-misc.c
	plugins/imgssapi/imgssapi.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
2009-11-17 10:38:46 +01:00
Rainer Gerhards
f94a3034b6 integrating varmojfekoj's "unlimited select()" patch into v4-devel 2009-11-17 09:10:24 +01:00
varmojfekoj
30c2e42ec3 added option to use unlimited-size select() calls
Thanks to varmjofekoj for the patch

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-11-17 09:00:01 +01:00
Rainer Gerhards
651bee9cf5 Merge branch 'omfile' into tmp
This was a complex manual merge, especially in action.c. So if
there occur some problems, this would be a good point to start
troubleshooting. I run a couple of tests before commiting and
they all went well.

Conflicts:
	action.c
	action.h
	runtime/queue.c
	runtime/queue.h
	runtime/wti.c
	runtime/wti.h
2009-06-22 15:12:35 +02:00
Rainer Gerhards
1e30f67584 added basic plumbing to support message properties separate from message
will fill this with live somewhat later, noticed I need to do some stage work
first (at least this is useful).
2009-06-16 19:32:53 +02:00
Rainer Gerhards
b5f3387357 Merge branch 'omfile' into v5-devel
Note that this was NOT a trivial merge, and there may be
some issues. This needs to be seen when we continue developing.

Conflicts:
	runtime/msg.h
	runtime/obj.h
	runtime/queue.c
	runtime/srUtils.h
	runtime/stream.c
	runtime/stream.h
	runtime/wti.c
	tests/Makefile.am
	tools/omfile.c
	tools/syslogd.c
2009-06-16 13:59:09 +02:00
Rainer Gerhards
16ecb90c3a omfile buffers are now synchronized after inactivity
This is the first shot at this functionality. Currently, we run off a fixed
counter in the rsyslogd mainloop, which needs to be restructured. But this
code works, so it is a good time for a commit.
2009-06-15 13:44:51 +02:00
Rainer Gerhards
6f4e3c4e4c restructered code in perparation for multiple rule set support
... this was long overdue, and I finlly tackeld it. It turned out to
be more complex than I initially thought. The next step now probably is
to actually implement multiple rule sets and the beauty that comes
with them.
2009-06-10 16:49:14 +02:00
Rainer Gerhards
92d10abc1b Merge branch 'master' into v5-devel
Conflicts:
	ChangeLog
	runtime/rsyslog.h
2009-06-04 03:27:41 +02:00
Rainer Gerhards
f54e72cec0 first proof of concept on zipped file writer
This DOES NOT work sufficiently well, I just wanted to verify that
zip writing is possible and files are readable. Will be refined
soon.
2009-06-03 14:45:09 +02:00
Rainer Gerhards
14d1209640 added a generic network stream server
(in addition to rather specific syslog tcp server)
2009-06-02 10:31:42 +02:00
Rainer Gerhards
fc0712f40a Merge branch 'master' into ultra-reliable
Conflicts:
	tests/Makefile.am
	tests/diskqueue.sh
2009-05-25 11:05:18 +02:00
Rainer Gerhards
7adb9877f0 fixing some nits with the build system 2009-05-22 17:40:24 +02:00
Rainer Gerhards
0fa5486a4a Merge branch 'master' into ultra-reliable
Conflicts:
	runtime/rsyslog.h
	tests/Makefile.am
	tools/syslogd.c
2009-05-22 17:23:08 +02:00
Rainer Gerhards
aba90e8248 added capability to run multiple tcp listeners (on different ports)
Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
2009-05-22 17:06:52 +02:00
Rainer Gerhards
bb79e96dc3 moving to a cleaner implementation of batches
... now that we know what we need from a theoretical POV.
2009-05-12 15:27:40 +02:00
Rainer Gerhards
924ceb305d Merge branch 'beta'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
2009-02-24 14:52:49 +01: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
Marius Tomaschewski
19ccebbf4c added capability to support multiple module search pathes.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-10-20 17:36:31 +02:00
Rainer Gerhards
4f32b62990 begun building a testbench 2008-06-13 17:21:03 +02:00
Michael Biebl
34054198fe Fix linker flags for librsyslog and rsyslogd
Use $(dl_libs) and $(rt_libs) instead of -ldl and -lrt. This ensures
that rsyslog can be successfully built on *BSD.

Don't like rsyslogd against $(dl_libs) and $(rt_libs) anymore. This
functionality is now in librsyslog.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-06-11 17:02:11 +02:00
Tiziano Mueller
275595cdf8 bugfix: missing linker options caused build to fail on some systems.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-05-21 12:19:38 +02:00
Rainer Gerhards
1c2268faa8 restructured netstrm driver layer
the new structure prevents repetitive loads and unloads of
driver files; it also has less overhead
The "select" and regular driver are now contained in a single
file.
2008-04-30 17:41:17 +02:00
Rainer Gerhards
c370fc6305 server handshake now works with nonblocking sockets 2008-04-30 16:35:35 +02:00
Rainer Gerhards
1cce2e35b0 removed loadbale module leak
- moved netstrms, netstrm and nssel into a single loadble module
  because they belong together
- fixed "loadbale module leak"
2008-04-29 12:21:52 +02:00