37 Commits

Author SHA1 Message Date
Rainer Gerhards
c28dde0a7f fix some compile problems on some platforms 2012-12-14 10:11:08 +01:00
Rainer Gerhards
42d1d27a01 Merge branch 'v7-stable-newmsglock' into master-newmsglock
Conflicts:
	runtime/msg.c
	runtime/queue.c
	tools/syslogd.c
2012-12-06 17:27:37 +01:00
Rainer Gerhards
c563914d6f queue: file delete stream does no longer do real io
This stream is primarily used for state tracking, and has been
modified to do just that. This results in considerable less io
being done and the respective speedup.
2012-11-19 16:46:41 +01:00
Rainer Gerhards
94f6326237 queue: reduce CPU load for deserializing message properties
Linear runtime due to message order. Was quadratic before. However, not
a big overall improvement.
2012-11-06 17:48:35 +01:00
Rainer Gerhards
704bb9fc21 queue: mini-improvement in deserializer (stage work) 2012-11-05 17:04:30 +01:00
Rainer Gerhards
c28d92259b queue: use specific deserializer for msg object
spares lengthy table lookups
2012-11-03 13:27:27 +01:00
Rainer Gerhards
6b3b08acc8 bugfix: invalid debug message for normal operation
had no effect except on debug log
2012-09-19 19:41:10 +02:00
Rainer Gerhards
de71589ca3 Merge branch 'v6-stable'
Conflicts:
	ChangeLog
	configure.ac
	runtime/ruleset.c
	tools/syslogd.c
2012-08-25 12:19:56 +02:00
Rainer Gerhards
4ce8111ea6 Merge branch 'v5-stable' into beta 2012-08-20 12:37:39 +02:00
Rainer Gerhards
9fb96ec343 nitfix: remove quirck in new debug message code 2012-08-01 15:56:42 +02:00
Rainer Gerhards
46f7f10e43 more elaborate debug logging for object deserializer 2012-08-01 15:37:00 +02:00
Rainer Gerhards
46ccc9e77f milestone: module() can load module in legacy mode 2012-06-20 09:34:31 +02:00
Rainer Gerhards
27360bb33f Merge branch 'v5-beta' into beta
Conflicts:
	runtime/modules.c
2012-06-06 18:49:32 +02:00
Rainer Gerhards
290f41f947 bugfix: potential hang due to mutex deadlock
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316
Thanks to Andreas Piesk for reporting&analyzing this bug as well as
providing patches and other help in resolving it.
2012-06-06 12:56:53 +02:00
Rainer Gerhards
46605923a2 refactor: removing dead apc code
another concept that did not prove valuable enough to be kept active. For
the last couple of releases, the dead code was kept inside the project as
we thought we could probably reuse it. Doesn't look so...
2012-01-19 15:37:56 +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
18e60f46a1 Merge branch 'v4-stable' into v5-stable
Conflicts:
	runtime/debug.h
	runtime/obj.c
	runtime/parser.h
	runtime/wti.h
2012-01-16 16:14:30 +01:00
Rainer Gerhards
f6dea36394 runtime license change 2012-01-16 12:39:01 +01:00
Rainer Gerhards
4f8457ffe3 step: added config-specific module list 2011-04-27 15:38:06 +02:00
Rainer Gerhards
8b246de2a5 some light performance enhancement
...by replacing time() call with much faster (at least under linux)
gettimeofday() calls.
2009-11-12 17:12:10 +01:00
Rainer Gerhards
c5408da3d8 new queue engine - initial commit (probably not 100% working!)
simplified and thus speeded up the queue engine, also fixed some
potential race conditions (in very unusual shutdown conditions)
along the way. The threading model has seriously changes, so there may
be some regressions.

NOTE: the code passed basic tests, but there is still more work
and testing to be done. This commit should be treated with care.
2009-10-14 11:01:21 +02:00
Rainer Gerhards
6946b6b7d9 bugfix: potential race in object loader during use/release of object interface 2009-09-22 12:48:51 +02:00
Rainer Gerhards
d2d54013ae going forward in moving string-handling functions to new interface... 2009-06-17 15:22:13 +02:00
Rainer Gerhards
98348ae03d Merge branch 'master' into omfile
Conflicts:
	ChangeLog
	runtime/msg.h
	tcps_sess.c
	tcpsrv.c
	tools/syslogd.c
2009-06-16 12:59:55 +02:00
Rainer Gerhards
f7579e68a6 done various optimizations to the stringbuf and its users 2009-06-16 11:36:05 +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
ca0ddc30a3 completed multi-ruleset core support
... as well as added multi-ruleset support for imtcp
2009-06-12 15:31:08 +02:00
Rainer Gerhards
1dbdee7c77 fixed a small memory leak...
and another problem, both introduced today. Also did some general cleanup.
2009-06-10 18:05:24 +02:00
Rainer Gerhards
9e434f19a9 cleaned up stream class ...
... and also made it callable via an rsyslog interface rather then
relying on the OS loader (important if we go for using it inside
loadbale modules, which we soon possible will)
2009-06-04 12:15:59 +02:00
Rainer Gerhards
262f61d869 added properties "inputname" and "$myhostname"
- added message property "inputname", which contains the name of the
  input (module) that generated it. Presence is depending on suport in
  each input module (else it is blank).
- added system property "$myhostname", which contains the name of the
  local host as it knows itself.
2008-09-10 15:59:53 +02:00
Rainer Gerhards
3f6c73a8b7 added (internal) error codes to error messages
Also added redirector to web description of error codes
closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
2008-06-27 12:52:45 +02:00
Rainer Gerhards
d451808236 reduced number of compile warnings in -pedantic gcc mode 2008-06-27 10:10:47 +02:00
Rainer Gerhards
abc7034f0d begun step-by-step guide for TLS protected syslog 2008-06-18 14:40:08 +02:00
Rainer Gerhards
055d4ffc2a fixed problem with module unload sequence 2008-04-29 15:36:22 +02:00
Rainer Gerhards
bf3d2c1b39 message reception via TCP work again
... at least in some cases ;) I assume there are still a couple
of bugs inside the code. But at least we have something from
where we can continue to work on.
2008-04-24 09:57:43 +02:00
Rainer Gerhards
60309004df completed better modularity of runtime
- added the ability to specify an error log function for the
  runtime
- removed dependency of core runtime on dirty.h

Note that it is "better" modularity, not perfect. There is still
work to do, but I think we can for the time being proceed with
other things.
2008-04-17 12:46:57 +02:00
Rainer Gerhards
8f8f65abb6 moved files to the runtime
there are still some files left which could go into the
runtime, but I think we will delete most of them once we
are done with the full modularization.
2008-04-16 10:26:54 +02:00