1307 Commits

Author SHA1 Message Date
Rainer Gerhards
237df37a86 bugfix: testbench was not activated if no Java was present on system
... what actually was a left-over. Java is no longer required.
2011-02-17 12:42:37 +01:00
Rainer Gerhards
1100fd18b4 preparing for v5.6.3 2011-01-26 12:54:52 +01:00
Rainer Gerhards
464103820b Merge branch 'v4-stable' into v5-stable 2011-01-26 12:38:02 +01:00
Rainer Gerhards
cdc27aea8f imfile bugfix: potential duplication of log content
Under some circumstances an invalid truncation was detected. This
code has now been removed, a file change (and thus resent) is only
detected if the inode number changes.
2011-01-10 08:22:50 +01:00
Rainer Gerhards
5085587806 bugfix: imfile potentially duplicates lines
This can happen when 0 bytes are read from the input file, and some
writer appends data to the file BEFORE we check if a rollover happens.
The check for rollover uses the inode and size as a criterion. So far,
we checked for equality of sizes, which is not given in this scenario,
but that does not indicate a rollover. From the source code comments:
   Note that when we check the size, we MUST NOT check for equality.
   The reason is that the file may have been written right after we
   did try to read (so the file size has increased). That is NOT in
   indicator of a rollover (this is an actual bug scenario we
   experienced). So we need to check if the new size is smaller than
   what we already have seen!
2010-12-17 18:18:57 +01:00
Rainer Gerhards
2181515805 bug fixes in action processing
- bugfix: action processor released mememory too early, resulting in
  potential issue in retry cases (but very unlikely due to another
  bug, which I also fixed -- only after the fix this problem here
  became actually visible).
- bugfix: batches which had actions in error were not properly retried in
  all cases
2010-12-17 10:43:55 +01:00
Rainer Gerhards
b9ba5013ad bugfix: batch processing flagged invalid message as "bad" under some circumstances
also fixed some cosmetic nits
2010-12-16 14:23:38 +01:00
Rainer Gerhards
189a26c044 Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c
2010-12-16 13:59:16 +01:00
Rainer Gerhards
371a8eec29 some cleanup based on clang static analyzer results 2010-12-16 12:57:55 +01:00
Rainer Gerhards
75bfef7fa1 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
2010-12-16 12:21:10 +01:00
Rainer Gerhards
ec6230cffe improved some code based on clang static analyzer results 2010-12-16 12:16:54 +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
c4026ec0f8 preparing for 5.6.2 2010-11-30 11:41:40 +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
Chris Metcalf
afafd9e0d7 bugfix: atomic increment for msg object may not work correct on all platforms.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-25 15:51:49 +01:00
Rainer Gerhards
64ecd12021 forgot to add to ChangeLog 2010-11-25 15:06:49 +01:00
Rainer Gerhards
65c7f46893 Merge branch 'v5.6.0a' into v5-stable
Conflicts:
	configure.ac
2010-11-25 14:47:21 +01:00
Rainer Gerhards
ed2a2fd829 Merge branch 'v4.4.2a' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	plugins/imfile/imfile.c
	runtime/stream.c
2010-11-25 12:52:24 +01:00
Rainer Gerhards
e4ac19d8ff final cleanup for 5.6.1 2010-11-24 16:27:14 +01:00
Rainer Gerhards
da8670d37a final preparations for release 2010-11-24 15:57:59 +01:00
Rainer Gerhards
b4da4fdac9 Merge branch 'v4-stable' into v5-stable
Conflicts:
	configure.ac
2010-11-24 12:57:46 +01:00
Rainer Gerhards
600bc06638 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
2010-11-24 11:25:22 +01:00
Rainer Gerhards
925504d565 bugfix(important): problem in TLS handling could cause rsyslog to loop
... in a tight loop, effectively disabling functionality and bearing the
risk of unresponsiveness of the whole system.
Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
2010-11-24 11:14:21 +01:00
Rainer Gerhards
c470879eff bugfix: testbench failed if imptcp was not enabled 2010-11-05 12:56:07 +01:00
Rainer Gerhards
cb04fc3972 permitted imptcp to work on systems which support epoll(), but not epoll_create().
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204
Thanks to Nicholas Brink for reporting this problem.
2010-11-05 11:02:14 +01:00
Rainer Gerhards
71b8b60b22 bugfix: segfault when an *empty* template was used
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206
Thanks to David Hill for alerting us.
2010-11-05 10:41:44 +01:00
varmojfekoj
7904ef4e37 bugfix: compile failed with --enable-unlimited-select
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-05 10:04:33 +01:00
Rainer Gerhards
40814bb030 imfile improvements
- added the $InputFilePersistStateInterval config directive to imfile
- changed imfile so that the state file is never deleted (makes imfile
  more robust in regard to fatal failures)
2010-10-27 10:10:47 +02:00
Rainer Gerhards
cd5190ad73 preparing for 5.6.0 2010-10-22 14:16:38 +02: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
3700a64d97 Merge branch 'v4-stable' into v4-devel
Conflicts:
	ChangeLog
	runtime/stream.c
2010-10-15 07:59:31 -07:00
Rainer Gerhards
90933057bc imfile: bugfixes in regard to large files (> 2GB)
- bugfix: a couple of problems that imfile had on some platforms, namely
  Ubuntu (not their fault, but occured there)
- bugfix: imfile utilizes 32 bit to track offset. Most importantly,
  this problem can not experienced on Fedora 64 bit OS (which has
  64 bit long's!)
2010-10-15 16:39:10 +02:00
Rainer Gerhards
205410c23a bugfix: a couple of problems that imfile had on some platforms
namely Ubuntu (not their fault, but occured there)
2010-10-15 06:37:58 -07:00
Rainer Gerhards
ddcb7d9af0 bugfix: imfile utilizes 32 bit to track offset
Most importantly, this problem can not experienced on recent Fedora
64 bit OS (which has 64 bit long's!)
2010-10-15 09:58:07 +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
d3fe3b28ac preparing for 5.5.7 2010-08-09 14:30:18 +02:00
Rainer Gerhards
550afa1fef Merge branch 'v4-devel'
Conflicts:
	runtime/rsyslog.h
2010-08-09 10:54:58 +02:00
Rainer Gerhards
40e70777ea Merge branch 'v4-devel'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/rsyslog_conf_modules.html
	runtime/rsyslog.h
	tests/Makefile.am
2010-08-06 17:32:29 +02:00
Rainer Gerhards
80ff634c84 added omuxsock, which permits to write message to local Unix sockets
this is the counterpart to imuxsock, enabling fast local forwarding
2010-08-06 17:25:38 +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
27678dc430 minor bug fixes
- doc for pmlastmsg and ruleset parsers were hard to read
- pmrfc3164sd had wrong name
2010-08-05 14:27:37 +02:00
Rainer Gerhards
1b1b6b85e6 Merge branch 'v4-devel'
Conflicts:
	doc/Makefile.am
	doc/manual.html
	doc/professional_support.html
2010-08-05 14:10:45 +02:00
Rainer Gerhards
1be7973069 Merge branch 'v4-stable' into v4-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2010-08-05 14:09:06 +02:00
Rainer Gerhards
318adf58de preparing for 4.6.4 2010-08-05 13:57:12 +02:00
Rainer Gerhards
9b3ed84087 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/professional_support.html
2010-08-05 11:37:38 +02:00
Rainer Gerhards
33a2855c69 preparing for 3.22.2 2010-08-05 11:33:14 +02:00
Rainer Gerhards
ebba229db9 Merge branch 'v4-devel' into master
Conflicts:
	ChangeLog
2010-08-05 08:40:18 +02:00
Rainer Gerhards
ae2d1c6fcb Merge branch 'v4-stable' into v4-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2010-08-05 08:37:17 +02:00
Rainer Gerhards
d51aefc052 Merge branch 'v3-stable' into v4-stable
Conflicts:
	runtime/conf.c
2010-08-05 08:32:06 +02:00