rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 17:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,628 Commits 67 Branches 505 Tags
Commit Graph

3628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Gerhards
48877c8ef4 milestone: added support for CEE-properties in property-based filters 2010-12-01 17:28:36 +01:00
Rainer Gerhards
b030fe7b1f milestone: ability to use normalized names in templates 2010-12-01 11:35:04 +01:00
Rainer Gerhards
471f07f45a milestone: template supports CEE output via %$!all-json% 2010-12-01 10:19:50 +01:00
Rainer Gerhards
cbfa21f823 mmnormalize loads & runs (basic testing done) 2010-12-01 09:37:13 +01:00
Rainer Gerhards
b9d3cdceab milestone: added mmnormalize (compiles, but untested) 2010-12-01 08:46:20 +01:00
Rainer Gerhards
d1ccc03026 Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
	configure.ac
v6.1.1 		2010-11-30 12:11:09 +01:00
Rainer Gerhards
1aac36dfd0 bumped version to 5.7.2 v5.7.2 2010-11-30 11:23:12 +01:00
Rainer Gerhards
786a44a024 Merge branch 'v5-devel' 
Conflicts:
	runtime/rsyslog.h
 2010-11-25 18:04:00 +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
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
775464beaa streamlined epoll_create() code a little bit 2010-11-25 14:52:38 +01:00
David Hill
e4e263243a fixed compile problem in imptcp if no epoll_create1() is present 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2010-11-25 14:51:02 +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
e4ac19d8ff final cleanup for 5.6.1 v5.6.1 2010-11-24 16:27:14 +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
v3.22.3 		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
7f6b471bf5 provide clear error message if platform does not support imptcp 2010-11-05 11:44:41 +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
950fe206f8 Merge branch 'v5-devel' 
Conflicts:
	plugins/imfile/imfile.c
 2010-10-20 16:19:18 +02:00
Rainer Gerhards
b8ffbecb78 Merge branch 'v5-devel' 2010-10-22 20:19:06 +02:00
Rainer Gerhards
aa0701b100 Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2010-10-22 20:18:58 +02:00
root
bd157a7d69 Merge branch 'v4-devel' into v5-devel 2010-10-20 15:08:08 +02:00
Rainer Gerhards
ffd08f2a6c 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-24 14:31:12 +02:00
Rainer Gerhards
096db025e2 fixing a potentially uninitialized variable v5.6.0 2010-10-19 04:03:43 -07:00
Rainer Gerhards
ed36822e37 Merge branch 'v4-stable' into v5-stable 
Conflicts:

	configure.ac
	runtime/cfsysline.c
	tools/ompipe.c
 2010-10-19 12:54:38 +02:00
Rainer Gerhards
ec339c9097 Merge branch 'v4-stable' into v4-devel 
Conflicts:

	runtime/cfsysline.c
	tools/ompipe.c
 2010-10-19 12:44:22 +02:00
Rainer Gerhards
9d98af3407 Merge branch 'v4-stable' into v4-devel 2010-10-22 14:28:53 +02:00
Rainer Gerhards
7cdc7cbaa0 better error messages in testbench 2010-10-22 14:28:31 +02:00
Rainer Gerhards
0a24b3afc0 fixing some compile problems on FreeBSD 2010-10-19 12:39:48 +02:00
Rainer Gerhards
0972943f52 fixed testbench compile problem on Solaris 2010-10-19 11:17:07 +02:00
Rainer Gerhards
2c9ca3fc9a yet another forgotten testbench file 2010-10-22 14:38:52 +02:00
Rainer Gerhards
73e4b2edc8 added forgotten testbench file 2010-10-22 14:31:53 +02:00
Rainer Gerhards
cb65e72f1e Merge branch 'v4-stable' into v5-stable 2010-10-22 14:29:04 +02:00
Rainer Gerhards
cd5190ad73 preparing for 5.6.0 2010-10-22 14:16:38 +02:00
Rainer Gerhards
93662146b4 Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
 2010-10-15 08:38:35 -07:00
Rainer Gerhards
87472f58b4 Merge branch 'v5-beta' into v5-devel 
Conflicts:
	Makefile.am
	plugins/imfile/imfile.c
	runtime/stream.c
	tests/tcpflood.c
 2010-10-15 08:34:08 -07:00
Rainer Gerhards
f76b826989 solved minor compile problem (caused by merge) 2010-10-15 17:21:03 +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
c27a2ab686 fixed incomplete merge 2010-10-15 07:47: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
ed9fd3541f imfile: bug fixes 
either one or two bugs fixed ;)
Definitely a problem where no state file is written when working with
relative pathes. Also, some problems with offsets should be fixed for
very large files. However, I could not yet experimentally show the issue
so it probably needs more verification.
 2010-10-15 08:23:29 +02:00
Rainer Gerhards
8c3d40b798 removed need for math library 
by doing math a little bit more optimal in hash table code. Also reduced
memory requirement for imuxsock hash tables (expected number of connections
was set too high -- table can be extended dynamically).
 2010-10-11 17:11:00 +02:00