297 Commits

Author SHA1 Message Date
Rainer Gerhards
68c13f3f6a Merge branch 'v4-devel' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	doc/manual.html
	plugins/imudp/imudp.c
	runtime/msg.h
	tools/syslogd.c
2010-12-17 12:39:59 +01:00
Rainer Gerhards
d3da845a61 Merge branch 'v5-stable' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2010-12-17 11:46:06 +01:00
Rainer Gerhards
699d0d933a added $LocalHostName config directive & some bugfixing
- added $LocalHostName config directive
- bugfix: local hostname was pulled too-early, so that some config
  directives (namely FQDN settings) did not have any effect
2010-12-16 15:29:20 +01:00
Rainer Gerhards
c5611012f9 fixed cosmetic nit (as a result of clang static code analyzer run) 2010-12-16 13:41:18 +01:00
Rainer Gerhards
06bad73052 cleanup of cosmetic nit (result of clang static code analyser run) 2010-12-16 13:40:23 +01:00
Rainer Gerhards
4da2cbcae7 Merge branch 'v4-stable' into v4-devel
Conflicts:
	runtime/parser.c
2010-12-16 13:00:27 +01:00
Rainer Gerhards
371a8eec29 some cleanup based on clang static analyzer results 2010-12-16 12:57:55 +01:00
Rainer Gerhards
1bfb97e576 bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported
also cleaned up some minor things
2010-12-02 07:28:04 +01:00
Rainer Gerhards
5d8b1846ec Merge branch 'v4-devel' into v5-beta
Conflicts:
	Makefile.am
	tests/tcpflood.c
2010-10-15 08:06:40 -07:00
Rainer Gerhards
735be1e247 minor: improved error message when already running 2010-09-17 10:15:20 +02:00
Rainer Gerhards
15b866ca0a Merge branch 'systemd' into v5-devel 2010-09-08 13:13:38 +02:00
Lennart Poettering
4132799268 acquire /dev/log socket optionally from systemd 2010-09-07 13:06:04 +02:00
Rainer Gerhards
a77a99bfbf Merge branch 'v4-devel' into master
Conflicts:
	Makefile.am
	tests/tcpflood.c
2010-08-11 12:49:16 +02:00
Rainer Gerhards
32e715929f Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
	Makefile.am
	configure.ac
	runtime/rsyslog.h
	tests/Makefile.am
2010-08-11 11:49:32 +02:00
Rainer Gerhards
55256ac968 added imptcp
imptcp is a simplified, Linux-specific and potentielly fast
syslog plain tcp input plugin (NOT supporting TLS!)
2010-08-10 14:51:43 +02:00
Rainer Gerhards
e4c926bfbc changed omudpspoof default spoof address to simplify typical use case 2010-08-05 15:44:01 +02:00
Rainer Gerhards
802f6d8a8f milestone(BUGGY): batch now pushed down to action
at least in important cases (not for non-direct action queues and some
other minor things). This version is definitely buggy, but may be tried
with success on a non-production system. I will continue to work on the
correctness, but needed to commit now to get a baseline.
2010-06-15 14:02:34 +02:00
Rainer Gerhards
fe8d317c1b milestone commit(BUGGY): batch is now handed down to rule processing
Now, the full batch is passed down to the rule, which then enqueues
the elements as single messages. Note that this code has some known
defects and needs more changes until it is correct again. This is
primarily a commit to be able to return to a known-(somewhat)-good
state.
2010-06-10 14:36:49 +02:00
Rainer Gerhards
8fbcea4837 main msg q consumer now preprocesses messages before doing rule processing
things like ACL check and message parsing. This leads to a greater level
of concurrent processing. Beware, though, that this commit duplicates
some messages. May be a regression from this or an earlier commit. I will
soon sort out.
2010-06-09 15:37:00 +02:00
Rainer Gerhards
395660f462 somewhat improved direct mode queue performance
... but only for batch enqueues. This will not help much with
the current code, but will play well with upcoming changes.
2010-06-09 14:34:35 +02:00
Rainer Gerhards
d9e64c16e5 finshed implementation of strgen modules
and also provided four build-in modules for the most common use
cases, hopefully resulting in a speedup of around 5% for typical
rsyslog processing.
2010-06-04 12:45:31 +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
74f8bf1465 some more cleanup and a nasty little bug i doDie() 2010-05-10 15:37:44 +02:00
Rainer Gerhards
0944d4b542 Merge branch 'v4-devel' into tmp 2010-04-26 12:12:37 +02:00
Rainer Gerhards
d198064316 added new $Sleep directive to hold processing for a couple of seconds during startup 2010-04-26 12:08:00 +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
2cd132eebb enhanced nettester tool so that it re-uses it's callers environment
this enables us to work with the "usual" environment tweaks (for
debugging and other purposes), without the need for any special
handling in nettester itself
2010-04-07 12:42:41 +02:00
Rainer Gerhards
302ad02e77 temporary bugfix replaced by permanent one for...
...message-induced off-by-one error (potential segfault) (see 4.6.2)
The analysis has been completed and a better fix been crafted and
integrated.
2010-03-31 16:21:58 +02:00
Rainer Gerhards
e0afe5c825 added some diagnostics info to startup 2010-03-23 08:03:21 +01:00
Rainer Gerhards
c802afb7e0 Merge branch 'v5-stable'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/property_replacer.html
	runtime/datetime.h
2010-03-09 14:28:30 +01:00
Rainer Gerhards
06387e5592 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/rt-init.c
2010-03-08 14:27:20 +01:00
Yann Droneaud
71ffb32ab8 Fix Large File Support (LFS) support (bug #182)
- _FILE_OFFSET_BITS must be defined before including any other system
headers otherwise it does nothing.

- Don't define it in rsyslog.h, let it be defined in config.h,
  and let ./configure script enable LFS since Autoconf provides
  a portable macro to enable LFS support : AC_SYS_LARGEFILE
2010-03-04 09:01:04 +01:00
Rainer Gerhards
abef390dae Merge branch 'beta' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c
2010-03-01 14:21:49 +01:00
Rainer Gerhards
eb3afa8000 Merge branch 'v4-stable' into tmp 2010-03-01 12:52:25 +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
Rainer Gerhards
af5fb078d4 message parser fixes and testbench enhancements
- improved testbench to contain samples for totally malformed messages
  which miss parts of the message content
- bugfix: some malformed messages could lead to a missing LF inside files
  or some other missing parts of the template content.
- bugfix: if a message ended immediately with a hostname, the hostname
  was mistakenly interpreted as TAG, and localhost be used as hostname
2010-02-22 14:25:56 +01:00
Rainer Gerhards
c577e9c64c bugfix: message without MSG part could case a segfault
[backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f]
This actually was a "recent" regression, but I did not realize that it
was introduced by the performance optimization in v4-devel. Shame on
me for having two devel versions at the same time...
2010-02-22 09:31:10 +01:00
Rainer Gerhards
4cefc40064 Merge branch 'beta'
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
2010-02-03 15:46:35 +01:00
Rainer Gerhards
9045537841 Merge branch 'v4-beta' into beta 2010-02-03 15:42:40 +01:00
Cristiano
66d129c9ca (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the correct value on FreeBSD.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-03 15:42:14 +01:00
Rainer Gerhards
074ec9495e backporting bugfixes from 5.2.2
- bugfix: queues in direct mode could case a segfault, especially if an
  action failed for action queues. The issue was an invalid increment of
  a stack-based pointer which lead to destruction of the stack frame and
  thus a segfault on function return.
  Thanks to Michael Biebl for alerting us on this problem.
  [backport from 5.5.2]
- bugfix: wrong memory assignment for a config variable (probably
  without causing any harm) [backport from 5.2.2]
2010-01-27 09:52:15 +01:00
Rainer Gerhards
eac8ef081b fixed small misalignment 2010-01-26 15:23:57 +01:00
Rainer Gerhards
855f349238 Merge branch 'beta' 2010-01-26 12:23:53 +01:00
Rainer Gerhards
7f4972b9fa Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
	runtime/queue.c
2010-01-26 12:09:48 +01:00
Rainer Gerhards
62e00d7a1c Merge branch 'v4-beta' into tmp
Conflicts:
	ChangeLog
2010-01-26 12:03:50 +01:00
Rainer Gerhards
bd03b86c63 bugfix: -d did not enable display of debug messages
regression from introduction of "debug on demand" mode
Thanks to Michael Biebl for reporting this bug
2010-01-19 15:49:26 +01:00
Rainer Gerhards
68bacb9a93 Merge branch 'v4-devel' 2009-12-04 13:20:24 +01:00
Rainer Gerhards
9e8556538a Merge branch 'v4-beta' into beta 2009-12-04 13:20:13 +01:00