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

7851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Gerhards
3efed52b30 omelasticsearch: properly handle errorfile in non-bulk mode 
see also: https://github.com/rsyslog/rsyslog/issues/104
 2014-09-25 15:39:31 +02:00
Rainer Gerhards
65fb492620 testbench: test for errorfile in nonbulkmode added 2014-09-25 15:03:56 +02:00
Rainer Gerhards
1568589b9c testbench: add test for elasticsearch errorfile (bulk mode) 2014-09-25 14:53:20 +02:00
Chris Hiszpanski
20d869968b Added LIBLOGGING_STDLOG_CFLAGS and LIBLOGGING_STDLOG_LIBS to automake sources 
Build was failing when using these variables
 2014-09-25 05:06:57 -07:00
Chris Hiszpanski
a532815477 Added libestr dependency to librsyslog_la automake target 
When using LIBESTR_CFLAGS and LIBESTR_LIBS directly, build fails without this.
 2014-09-25 04:13:12 -07:00
Rainer Gerhards
d30287e24a Merge branch 'v8-stable' into v8-stable-es-fix 2014-09-25 12:19:13 +02:00
Rainer Gerhards
543adc144e testbench: some plumbing for new es tests 2014-09-25 12:18:50 +02:00
Rainer Gerhards
d825d37877 testbench: some plumbing for new es tests 2014-09-25 12:18:08 +02:00
Rainer Gerhards
2446a796be testbench: add tests for elasticsearch errorfile 
this is not yet integrated into the automatted test build,
as the current code seems to have some issues which must
be sorted out first. A branch with patches already exists, but
they need these tests to be verified.
 2014-09-25 12:15:35 +02:00
Rainer Gerhards
d1fe0fcbce testbench: add bulk mode test for elasticsearch 2014-09-25 11:56:42 +02:00
Rainer Gerhards
124f726a0e maintain ChangeLog v7.6.6 2014-09-25 09:01:54 +02:00
Rainer Gerhards
5a1313b27f Merge branch 'v7-stable-prifix' into v8-stable-prifix 
Conflicts:
	ChangeLog
	configure.ac
	grammar/rainerscript.h
 2014-09-24 18:30:36 +02:00
Rainer Gerhards
2284eea340 Merge branch 'v8-stable' into v8-stable-prifix 
Conflicts:
	runtime/syslogd-types.h
 2014-09-24 18:25:26 +02:00
Rainer Gerhards
7cdf9279af some more adjustments 2014-09-24 17:37:34 +02:00
Rainer Gerhards
da24cf6c8c fix off64_t problem (kinda...) 2014-09-24 17:28:30 +02:00
Rainer Gerhards
c48dc42868 prepare for 7.6.6 release 2014-09-24 17:17:12 +02:00
Rainer Gerhards
2aef39f1fb Merge branch 'v7-stable' into v7-stable-prifix 2014-09-24 17:07:31 +02:00
Rainer Gerhards
dd754638d2 Merge branch 'v7-stable' into v7-stable-prifix 2014-09-24 17:06:55 +02:00
Rainer Gerhards
a079a1b152 testbench: add new test 
... not a very smart or important one, but it was created during
a live hangout and so why not add it ;)
 2014-09-24 13:00:56 +02:00
Rainer Gerhards
29169a3315 Merge branch 'v8-stable' 2014-09-23 18:40:40 +02:00
Rainer Gerhards
35ceddef9b Merge branch 'v7-stable' into v8-stable 2014-09-23 10:54:55 +02:00
Reed Morrison
e875a534a7 Fixing bug with keep-alive with gtls. 2014-09-23 10:54:43 +02:00
Rainer Gerhards
a2fec660e8 Merge pull request #124 from EdgeCast/master 
Fixing bug with keep-alive with gtls.
 2014-09-23 10:53:21 +02:00
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
143b79dfc4 Merge branch 'v7-stable' into v7-stable-prifix 2014-09-22 07:17:19 +02:00
Reed Morrison
7c515efa36 Fixing bug with keep-alive with gtls. 2014-09-19 23:43:13 -07: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
da0c540c1b consistent handling of invalid pri value 2014-09-18 08:55:37 +02:00
Rainer Gerhards
0852285e44 Merge branch 'v7-stable' into tmp 
Conflicts:
	runtime/syslogd-types.h
 2014-09-18 08:47:31 +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
430b01de58 fix compile problems 
unfortunately a bit dirty, at least as far as NFACILITIES define is concerned.
I could not find any clean way to get off64_t type definition so that I could
simply use rsyslog.h :-(
 2014-09-16 15:44:33 +02:00
Rainer Gerhards
3d4bc8ec9a Merge branch 'v7-stable-prifix' into v8-stable-prifix 2014-09-16 15:09:07 +02:00
Rainer Gerhards
f6cdf358ae prevent compiler warnings 2014-09-16 15:08:37 +02:00
Rainer Gerhards
b11bf2745c Merge branch 'v7-stable-prifix' into v8-stable-prifix 
WARNING: does not compile, will be fixed with next commit

Conflicts:
	configure.ac
	tools/rsyslogd.c
 2014-09-16 14:59:14 +02:00
Rainer Gerhards
1ac20ffe97 Merge branch 'v5-stable-prifix' into v7-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imtemplate/imtemplate.c
	plugins/imuxsock/imuxsock.c
	runtime/msg.c
	runtime/rsyslog.h
	runtime/rule.c
	runtime/syslogd-types.h
	tools/syslogd.c
 2014-09-16 14:48:29 +02:00
Rainer Gerhards
df4e90f602 Merge branch 'v5.8.13-prifix' into v5-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/ksym.c
	runtime/rule.c
 2014-09-16 12:43:29 +02:00
Rainer Gerhards
2a9f4e6030 Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 
Conflicts:
	plugins/imklog/imklog.c
 2014-09-16 12:11:09 +02:00
Rainer Gerhards
52753c5c54 Merge branch 'v3-stable-prifix' into tmp 
Conflicts:
	runtime/rsyslog.h
 2014-09-16 11:56:55 +02:00
Rainer Gerhards
3a550cd853 fix wrong patch 
comment was unended, was pure accident it compiled...
 2014-09-16 11:52:16 +02:00