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

3956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
 2012-01-14 18:32:40 +01:00
Rainer Gerhards
e335a65788 more license analysis & change 2012-01-14 18:01:12 +01:00
Jim Hill
d850639d9b rsyslog.conf.5 socket module example sb imuxsock 2012-01-14 16:57:10 +01:00
Rainer Gerhards
ca39d8e60e more files moved to ASL 2.0 2012-01-12 03:29:19 +01:00
Rainer Gerhards
a357646ca1 relicense to ASL 2.0 2012-01-11 18:52:53 +01:00
Rainer Gerhards
0862e839b6 some more files to ASL 2.0 2012-01-11 18:49:00 +01:00
Rainer Gerhards
0216053099 relicense parts under ASL 2.0 
after carful check for copyright holder
 2012-01-11 18:30:33 +01:00
Kaiwang Chen
791b16ce06 bugfix: instabilities when using RFC5424 header fields 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2012-01-09 14:32:52 +01:00
Rainer Gerhards
74722b2331 bugfix: stats counter were not properly initialized on creation 2011-12-20 18:22:58 +01:00
Rainer Gerhards
f112b51b8d bugfix: imuxsock did truncate part of received message if it did not contain a proper date. 
The truncation occured because we removed that part of the messages
that was expected to be the date.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
 2011-12-20 16:39:39 +01:00
Rainer Gerhards
db137ef8c1 Merge branch 'v4-stable' into v5-stable 2011-12-16 11:05:16 +01:00
Tomas Heinrich
5f662e81de bugfix: potential fatal abort in omgssapi 2011-12-16 10:54:40 +01:00
Rainer Gerhards
21c2f630e9 added doc for omprog 2011-12-16 10:31:17 +01:00
Rainer Gerhards
d2da5f39d0 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	action.c
 2011-12-01 11:30:10 +01:00
Rainer Gerhards
cb0087ec47 Merge branch 'v3-stable' into v4-stable 2011-12-01 11:26:24 +01:00
Tomas Heinrich
9859818ecc bugfix: action resume interval incorrectly handled, thus took longer to resume 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-12-01 11:25:47 +01:00
Tomas Heinrich
ffa6e3b941 bugfix: cosmetic: proper constant used instead of number in open call 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-12-01 11:18:49 +01:00
Rainer Gerhards
d34a25b78c Merge branch 'v4-stable' into v5-stable 2011-11-03 10:13:44 +01:00
Rainer Gerhards
eae869a3a4 doc bugfix: typo in imgssapi doc 2011-11-03 10:13:11 +01:00
Rainer Gerhards
68ac2ae9bc Merge branch 'v4-stable' into v5-stable 2011-10-25 14:59:55 +02:00
Rainer Gerhards
f3a7232069 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	ChangeLog
 2011-10-27 09:39:45 +02:00
Tomas Heinrich
9b305b5de5 bugfix: potential abort after reading invalid X.509 certificate 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-10-27 09:37:27 +02:00
Rainer Gerhards
48e01bf415 doc: imfile: clarified that empty lines are not processed 2011-10-25 14:59:29 +02:00
Rainer Gerhards
5d67d98c35 preparing for 5.8.6 release v5.8.6 2011-10-21 14:23:13 +02:00
Rainer Gerhards
10947b3f4a bugfix: missing whitespace after property-based filter was not detected 2011-10-21 14:05:59 +02:00
Rainer Gerhards
5cf2c69668 Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable 2011-10-21 11:42:24 +02:00
Rainer Gerhards
ce315e5da3 minor: slightly improved error reporting when dynafile open fails 2011-10-20 14:26:51 +02:00
Rainer Gerhards
599a493cac Merge branch 'v4-stable' into v5-stable 2011-10-20 12:08:38 +02:00
Rainer Gerhards
eb87d6f095 doc bugfix: pri-text neees to be fixed in an article as well 2011-10-20 12:08:03 +02:00
Rainer Gerhards
b9ca8e0b1e doc bug: property pri-text was incorrectly described 2011-10-20 12:05:57 +02:00
Rainer Gerhards
bea330746c bugfix: $OMFileFlushInterval period was doubled - now using correct value 2011-10-18 13:43:34 +02:00
Rainer Gerhards
f84c8c4e96 Merge branch 'v4-stable' into v5-stable 2011-10-17 14:44:13 +02:00
Rainer Gerhards
9a0548d290 doc: clarified that imklog does not support Solaris 2011-10-17 14:43:43 +02:00
Rainer Gerhards
f06862eff5 Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable 
Conflicts:
	ChangeLog
 2011-10-17 13:04:59 +02:00
Vlad Grigorescu
e2836f5f43 bugfix: ActionQueue could malfunction due to index error 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-10-17 13:03:52 +02:00
Rainer Gerhards
0de862d5a6 doc: mention imported bugfix in ChangeLog 2011-10-13 10:45:25 +02:00
Rainer Gerhards
f6aaff61de Merge branch 'v4-stable' into v5-stable 2011-10-13 10:45:00 +02:00
Tomas Heinrich
8dd9959735 bugfix: $ActionExecOnlyOnce interval did not work properly 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-10-13 10:43:59 +02:00
Rainer Gerhards
d6a6666b66 bugfix: race condition when extracting structured data and PROCID 
same issue as previous commit for PROGNAME and APPNAME
 2011-10-13 08:15:54 +02:00
Rainer Gerhards
4831a51f5a bugfix: race condition when extracting program name and APPNAME 
could lead to invalid characters e.g. in dynamic file names
 2011-10-13 08:04:40 +02:00
Rainer Gerhards
cd5253fa82 bugfix: imfile did invalid system call under some circumstances 
when a file that was to be monitored did not exist BUT the state file
actually existed. Mostly a cosmetic issue. Root cause was incomplete
error checking in stream.c; so patch may affect other code areas.
 2011-10-07 11:42:49 +02:00
Rainer Gerhards
cf1aaf14fa fixed compiler warnings in tcpflood.c 2011-10-06 11:42:47 +02:00
Rainer Gerhards
b26387e6b2 bugfix: omfile returns fatal error code for things that go really wrong 
previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.
 2011-09-26 11:36:44 +02:00
Rainer Gerhards
6d3cc9e406 Merge branch 'v4-stable' into v5-stable 
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/parser.c
	runtime/rsyslog.h
	tests/Makefile.am
	tests/tcpflood.c
 2011-09-22 12:20:27 +02:00
Rainer Gerhards
086db18cc3 bugfix: potential abort if ultra-large file io buffers are used and 
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
 2011-09-20 15:16:53 +02:00
Rainer Gerhards
1d0e4ba3b3 Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable 2011-09-15 15:17:47 +02:00
Andrew Stothard
b7e69a2400 typo fix 2011-09-15 15:17:09 +02:00
Rainer Gerhards
11ee5cbdfb Merge branch 'v4-beta' into v4-stable, prep for 4.8.0 
There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.

Conflicts:
	configure.ac
	doc/manual.html
v4.8.0 		2011-09-07 15:38:57 +02:00
Rainer Gerhards
d023d12bf9 bugfix: imuxsock did no longer ignore message-provided timestamp, 
if so configured (the *default*). Lead to no longer sub-second timestamps.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
 2011-09-07 15:11:20 +02:00
mono_matsuko
fb7fab511e bugfix: rsyslogd -v always said 64 atomics were not present 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-09-05 12:18:11 +02:00