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

7705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Gerhards
fdcd60786d Merge branch 'v8-stable' 2014-09-23 10:41:42 +02:00
Rainer Gerhards
a42d7618f7 maintain ChangeLog 2014-09-23 10:41:22 +02:00
Rainer Gerhards
1a9fcb9ec8 Merge branch 'v7-stable' into v8-stable 2014-09-23 10:40:48 +02:00
Rainer Gerhards
0623bc850d maintain ChangeLog 2014-09-23 10:40:35 +02:00
Andreas Stieger
f122b4d08b fix build with json-c 0.12 if it provides a compatibility json.pc 
json-c on openSUSE provides a compatibility pkg-config for "json".
The autoconf check find it first, assuming it does not provide
the function json_tokener_error_desc. Check for availability of
function using AC_CHECK_FUNCS instead to define the corresponding
HAVE_JSON_TOKENER_ERROR_DESC macro.
 2014-09-23 10:15:59 +02:00
Rainer Gerhards
a9dc37970a Merge pull request #125 from andreasstieger/json-c-0.12-autoconf 
fix build with json-c 0.12 if it provides a compatibility json.pc
 2014-09-23 10:11:21 +02:00
Andreas Stieger
0d2789ed94 fix build with json-c 0.12 if it provides a compatibility json.pc 
json-c on openSUSE provides a compatibility pkg-config for "json".
The autoconf check find it first, assuming it does not provide
the function json_tokener_error_desc. Check for availability of
function using AC_CHECK_FUNCS instead to define the corresponding
HAVE_JSON_TOKENER_ERROR_DESC macro.
 2014-09-22 21:00:55 +01:00
Rainer Gerhards
546cd40be0 Merge branch 'v8-stable' 2014-09-19 14:44:58 +02:00
Rainer Gerhards
d350480603 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
 2014-09-19 14:44:48 +02:00
Rainer Gerhards
64de2f9f4c maintain ChangeLog 2014-09-19 12:35:19 +02:00
Rainer Gerhards
0403361ac5 add missing definitions 2014-09-19 12:18:51 +02:00
Rainer Gerhards
323def53e2 Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable v7.6.5 2014-09-17 12:07:51 +02:00
Rainer Gerhards
cbcfdbbba7 prepare for 7.6.5 release 2014-09-17 12:02:57 +02:00
Rainer Gerhards
b17a9e6f59 bugfix: in 7.6.4, pri-based filters did not work correctly 
messages were distributed to the wrong bins.
 2014-09-17 11:16:45 +02:00
Rainer Gerhards
8fc65791b2 fix build problem on platforms without atomic instructions 
Thanks to Michael Biebl for his very helpful analysis of the bug.
 2014-09-15 12:47:06 +02:00
Rainer Gerhards
f10aa11301 Merge branch 'v8-stable' 
Conflicts:
	runtime/Makefile.am
 2014-09-11 15:39:28 +02:00
Rainer Gerhards
d8f9b5a0f0 Merge branch 'v7-stable' 2014-09-12 11:16:11 +02:00
Rainer Gerhards
09bb812434 Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable 2014-09-12 11:15:54 +02:00
Rainer Gerhards
00b3766689 define a macro missing on some very few platforms 2014-09-11 17:48:13 +02:00
Rainer Gerhards
c8bb099455 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
 2014-09-11 13:30:49 +02:00
Rainer Gerhards
e323881b3a Merge branch 'v7-stable' into v8-stable 2014-09-11 17:48:58 +02:00
Rainer Gerhards
aabdd047c9 prepare for 7.6.4 v7.6.4 2014-09-11 13:29:37 +02:00
Rainer Gerhards
a21a40f0f2 Merge pull request #118 from alexjfisher/liblogging_filenotfound_compilation_fix 
Fix build error.
 2014-09-05 14:14:05 +02:00
Rainer Gerhards
d8d95f4e98 undo unnecessary change (libs are not needed) 2014-09-05 14:10:25 +02:00
Alex Fisher
fad8166306 Fix build error. 
Fixes rsyslog.c:62:31: error: liblogging/stdlog.h: No such file or directory
 2014-09-05 14:08:54 +02:00
Rainer Gerhards
20d8a9904e make gntls tcp syslog driver emit more error messages 
Messages previously emitted only to the debug log are now emitted as
syslog error messages. It has shown that they contain information
helpful to the user for troubleshooting config issues. Note that this
change is a bit experimental, as we are not sure if there are situations
where large amounts of error messages may be emitted.
 2014-09-05 13:02:28 +02:00
Rainer Gerhards
4ee481897a Merge branch 'v8-stable' 2014-09-05 12:02:43 +02:00
Rainer Gerhards
b207943408 maintain ChangeLog 
mentioned patch closes https://github.com/rsyslog/rsyslog/issues/109
 2014-09-05 12:00:24 +02:00
anthcourtney
fb6f8f15fd anon_cc_nbrs: fix syntax error 2014-09-05 11:58:43 +02:00
Rainer Gerhards
f184e8639c Merge branch 'v8-stable' 2014-09-05 11:39:36 +02:00
Michael Biebl
99c937f460 small systemd service file tweaks 2014-09-05 11:38:25 +02:00
Alex Fisher
4fff234839 Fix build error. 
Fixes rsyslog.c:62:31: error: liblogging/stdlog.h: No such file or directory
 2014-09-04 16:11:21 +01:00
Rainer Gerhards
3b4f8d02a7 Merge branch 'v8-stable' 2014-09-04 12:41:53 +02:00
Rainer Gerhards
1743bc4847 Merge pull request #114 from jaredj/txn-data-loss 
Don't lose uncommitted data on DB retries
 2014-09-04 12:43:51 +02:00
Rainer Gerhards
7ca55256a2 maintain ChangeLog 2014-09-04 12:41:36 +02:00
Jared Johnson
9fd5e8c7d3 Don't lose uncommitted data on DB retries 
Backport ompgsql2 patch to avoid losing uncommitted data on DB retries.

Bugzilla bug for this issue: http://bugzilla.adiscon.com/show_bug.cgi?id=528
Original ompgsql2 patch: http://bugzilla.adiscon.com/show_bug.cgi?id=453#c5
 2014-09-04 12:40:32 +02:00
Rainer Gerhards
8f85738a10 Merge branch 'v8-stable-es-tests' into v8-stable 2014-09-04 11:46:45 +02:00
Rainer Gerhards
5b427229b1 add basic elasticsearch test to build/testbench system 2014-09-04 11:45:58 +02:00
Rainer Gerhards
6e6474ac7a Merge branch 'v8-stable' 2014-09-04 11:35:08 +02:00
Rainer Gerhards
d8bdea3569 maintain ChangeLog 2014-09-04 11:34:55 +02:00
Rainer Gerhards
fb5e1ea73a nit: fix copyright year 2014-09-04 11:34:21 +02:00
Rainer Gerhards
c3a349a0b7 Merge branch 'v7-stable' into v8-stable 2014-09-04 11:33:34 +02:00
Rainer Gerhards
4aaf373bba bugfix: imfile: if a state file for a different file name was set, 
that different file (name) was monitored instead of the configured
one. Now, the state file is deleted and the correct file monitored.

closes: https://github.com/rsyslog/rsyslog/issues/103
 2014-09-04 11:32:04 +02:00
Rainer Gerhards
1e72b08c71 Merge pull request #116 from flicker581/fix-omudpspoof 
Omudpspoof source ports are not generated properly
 2014-09-04 10:29:59 +02:00
Rainer Gerhards
584678a112 maintain ChangeLog 2014-09-04 10:26:42 +02:00
Pavel Levshin
9cf6213d87 Omudpspoof: Minor cleanup of compiler warnings. 2014-09-04 10:25:53 +02:00
Pavel Levshin
db1fe2ddfd Omudpspoof: fix incorrect source ports, caused by wrong byte order. 2014-09-04 10:25:41 +02:00
Pavel Levshin
08f8ee1b49 Omudpspoof: Minor cleanup of compiler warnings. 2014-09-03 21:12:59 +04:00
Pavel Levshin
3042fa3a61 Omudpspoof: fix incorrect source ports, caused by wrong byte order. 2014-09-03 21:07:47 +04:00
bodik
d17fdbc923 imgssapi: add keepalive option 2014-09-03 11:13:23 +02:00