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

3979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Gerhards
29807bb3c9 Merge branch 'v5-stable' into v5-stable-newstats 
Conflicts:
	plugins/impstats/impstats.c
 2012-01-16 16:25:45 +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
bd22bf8cb4 license changes 2012-01-16 15:23:01 +01:00
Rainer Gerhards
f6dea36394 runtime license change 2012-01-16 12:39:01 +01:00
Rainer Gerhards
095021e866 Merge branch 'v4-stable' into v5-stable 2012-01-14 19:04:46 +01:00
Rainer Gerhards
6df41eaa88 license change 
after careful consideration of affected code
 2012-01-14 19:01:44 +01:00
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
Rainer Gerhards
17ee19bb5c Merge branch 'v5-stable' into v5-stable-newstats 2012-01-09 15:05:22 +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
785e107502 push version number 2012-01-09 12:39:02 +01:00
Rainer Gerhards
355b6818b8 imudp: added per-listner stats settings & more refactoring 2012-01-09 11:55:57 +01:00
Rainer Gerhards
c0b3c93a8b imudp refactor: field renaming (new names more more sense) 2012-01-09 09:43:01 +01:00
Rainer Gerhards
c1ac395b0b imudp refactor: regression fix 2012-01-09 09:36:15 +01:00
Rainer Gerhards
5438784b3f imudp refactor: fixed socket leak 2012-01-09 09:01:44 +01:00
Rainer Gerhards
6ea4cb7f53 nit fixed (testing aid removed) 2012-01-08 17:42:55 +01:00
Rainer Gerhards
7774a3e874 cleanup of imudp to use better lstn data structure (part I) 2012-01-08 17:41:08 +01:00
Rainer Gerhards
d61eb8067b prepared milestone (version push) 2011-12-21 14:48:54 +01:00
Rainer Gerhards
af720e9f9d Merge branch 'v5-stable' into v5-stable-newstats 
Conflicts:
	ChangeLog
 2011-12-20 18:24:02 +01:00
Rainer Gerhards
74722b2331 bugfix: stats counter were not properly initialized on creation 2011-12-20 18:22:58 +01:00
Rainer Gerhards
832d6e1e2c imtcp: added stats counters 
also adds counters to other users of tcpsrv.c method, but these do not
work if default submit method is overwritten (currently only the case
for imdiag, what we don't consider a problem)
 2011-12-20 18:19:14 +01:00
Rainer Gerhards
8d2f6675c4 bugfix: stats counter were not properly initialized on creation 2011-12-20 18:17:45 +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
5ba3fc7238 imudp: stats added 2011-12-19 17:08:06 +01:00
Rainer Gerhards
32203be41a better performance for action stats & cleanup: removing debug prints 2011-12-19 14:19:37 +01:00
Rainer Gerhards
58d1c9e21b flagged special branch version 2011-12-19 12:46:13 +01:00
Rainer Gerhards
7837c523b8 additional counter for lost messages due to failed actions added 2011-12-19 12:34:19 +01:00
Rainer Gerhards
5fe837bf7d added instrumentation 2011-12-19 11:16:07 +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