12127 Commits

Author SHA1 Message Date
Rainer Gerhards
0b01af41ed testbench: add test for potential parse_json() memory leaks
see also https://github.com/rsyslog/rsyslog/issues/2391
2018-01-16 12:28:51 +01:00
Rainer Gerhards
cdc7271232 script bugfix: memory leak in parse_json() function
This is a bad memory leak, it grows with each function invocation.

closes https://github.com/rsyslog/rsyslog/issues/2391
2018-01-16 12:25:41 +01:00
Rainer Gerhards
387f051178 maintain ChangeLog 2018-01-16 09:21:37 +01:00
Rainer Gerhards
2dacb45236
Merge pull request #2393 from rgerhards/cid-185407
lookup: fix dead code (caused no harm)
2018-01-16 09:21:14 +01:00
Rainer Gerhards
f87498e1f1
Merge pull request #2385 from jsiwrk/feature/omprog_feedback_simple_test
omprog: added test for feedback feature (without using transactions)
2018-01-16 09:15:40 +01:00
Rainer Gerhards
0fabb7d462
Merge pull request #2394 from rgerhards/i2386
build system: remove spurios xOS_LINUX definition
2018-01-16 07:55:07 +01:00
Rainer Gerhards
7784576dee
Merge pull request #2392 from rgerhards/travis-combined-build-test
Travis: improve build matrix
2018-01-16 07:52:23 +01:00
Rainer Gerhards
c9d37ac6f7 build system: remove spurios xOS_LINUX definition
This was used nowhere. It most probably was a forgotten left-over
from an experiment.

closes https://github.com/rsyslog/rsyslog/issues/2386
2018-01-15 18:14:21 +01:00
Rainer Gerhards
fe3ecb26cd
Merge pull request #2390 from jgerhards/errmsg-tcps_sess
tcps_sess: use new ermsg interface
2018-01-15 18:11:34 +01:00
Rainer Gerhards
077d931547 fix compiler warning under alpine linux 2018-01-15 18:07:13 +01:00
Rainer Gerhards
89318b2dea travis: combine some build checks
... and do them via containers. This also reduces resource usage and
runtime on Travis a bit.
2018-01-15 18:07:06 +01:00
Rainer Gerhards
b6216c9246 lookup: fix dead code (caused no harm)
Detected by Coverity scan, CID 185407
2018-01-15 17:57:45 +01:00
Rainer Gerhards
8f6de66aa6
Merge pull request #2389 from rgerhards/travis-no-cron
travis: do not unnecessarily run checks under cron
2018-01-15 12:53:54 +01:00
Jan Gerhards
aefa89d3c0 tcps_sess: use new ermsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-01-15 10:55:34 +01:00
Rainer Gerhards
a8426f507a travis: do not unnecessarily run checks under cron 2018-01-14 17:31:12 +01:00
Rainer Gerhards
9fd114d476 maintain ChangeLog 2018-01-14 16:55:49 +01:00
Rainer Gerhards
5b20e4ccc1
Merge pull request #2388 from rgerhards/statan-container
add reproducible static analyzer builds
2018-01-14 16:55:00 +01:00
Rainer Gerhards
d4c6c5f468
Merge pull request #2377 from rgerhards/container-no-pidfile
core: do not write pid file by default if running as pid 1
2018-01-14 16:52:20 +01:00
Rainer Gerhards
815c2cd99f
Merge pull request #2387 from mbiebl/no-libcurl
build system: Don't link core against libcurl if explicitly requested
2018-01-14 16:50:48 +01:00
Rainer Gerhards
f530ba0045 maintain ChangeLog 2018-01-14 16:28:37 +01:00
Rainer Gerhards
1c619fb69d
Merge pull request #2381 from rgerhards/fix-alpine-warnings
fix build warning on Alpine Linux
2018-01-14 16:27:50 +01:00
Rainer Gerhards
b89466e105 Travis: run static analyzer via standard dev container
also some improvements to somewhat optimize the build matrix so
that we avoid unnecessary work.
2018-01-14 13:56:27 +01:00
Michael Biebl
50205ced0f build system: Don't link core against libcurl if explicitly requested
When using --disable-libcurl, libgrammar should not be linked against
libcurl unconditionally as CURL_LIBS might be set if one of the modules
using libcurl, like elasticsearch, is enabled.
2018-01-14 12:21:42 +01:00
Rainer Gerhards
0d1658d26f omkafka: fix build problem with old librdkafka 2018-01-14 11:00:26 +01:00
Rainer Gerhards
2fb499d5fe dev: add consistent development tools
most importantly provide a way to run the static analyzer consistently.
This is done via docker container.
2018-01-14 11:00:26 +01:00
Joan Sala
b6b0c54ebb omprog: added test for feedback feature (without using transactions) 2018-01-13 19:22:18 +01:00
Rainer Gerhards
5a2779b2d7
Merge pull request #2384 from rgerhards/travis-improve
Travis: check build on Alpine Linux and Ubunut rolling (via docker co…
2018-01-13 11:30:07 +01:00
Rainer Gerhards
aace167dab
Merge pull request #2379 from jgerhards/errmsg-modules
modules: use new errmsg interface
2018-01-12 18:09:46 +01:00
Rainer Gerhards
f356d9f399 Travis: check build on Alpine Linux and Ubunut rolling (via docker container) 2018-01-12 17:29:02 +01:00
Rainer Gerhards
d7aea382fa fix build warning on Alpine Linux
due to old-style header names -- now using the new ones, which are also
supported on the other platforms.
2018-01-12 13:15:55 +01:00
Rainer Gerhards
3e009ea42a maintain ChangeLog 2018-01-12 11:51:07 +01:00
Rainer Gerhards
a87de59f6d
Merge pull request #2341 from bayaro/master
doFuncReplace(): add tail of src if tail is partially similar to 'replaceWith'
2018-01-12 11:48:56 +01:00
Rainer Gerhards
52a3c870bf
Merge pull request #2378 from Whissi/fix-build-without-libcurl
Fix build without libcurl
2018-01-12 11:46:54 +01:00
Jan Gerhards
05582a24ca modules: use new errmsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-01-12 09:47:11 +01:00
Thomas Deutschmann
468eeb79b8
tests: Run rscript_http_request.sh only when built with libcurl 2018-01-11 18:39:23 +01:00
Dan Molik
d9475f133e
Fix building with --disable-libcurl
Fixes: https://github.com/rsyslog/rsyslog/issues/2374
2018-01-11 18:39:16 +01:00
Rainer Gerhards
7e6d28a414 core: do not write pid file by default if running as pid 1
This means we run inside a container and writing pid files is unnecessary
and bad practice in this case.
2018-01-11 15:38:45 +01:00
Rainer Gerhards
324e91f005 maintain ChangeLog 2018-01-11 14:16:57 +01:00
Rainer Gerhards
7b91b960ff
Merge pull request #2373 from rgerhards/i2371
core: detect if runing in container, enable ctl-c if so
2018-01-11 14:15:58 +01:00
Rainer Gerhards
f557211f94 core: detect if runing in container, enable ctl-c if so
This also sets the basis for other container-specific config changes
and other optimizations.

closes https://github.com/rsyslog/rsyslog/issues/2371
2018-01-10 13:05:34 +01:00
Rainer Gerhards
33134a30d9 maintain ChangeLog 2018-01-09 17:49:45 +01:00
Rainer Gerhards
28df5bf039
Merge pull request #2369 from rgerhards/i533
add global config setting shutdown.enable.ctl-c to enable ctl-c
2018-01-09 17:48:05 +01:00
Rainer Gerhards
efc71f1518 bump version number for next release cycle 2018-01-09 13:10:06 +01:00
baya
94e2be20d8 + yet one rscript_replace_complex test 2018-01-09 12:23:13 +02:00
baya
9c7413beb7 doFuncReplace(): add tail of src if tail is partially similar to 'replaceWith'
if the tail of message similar to replacement string. Example:
msg: 1234567890
replacement: 8906
the last N (amount of similar symbols in tail of message and the begin of replacement,
in current example = 3) will never be assigned in dst message. And will contain a garbage.
As longer replacement string as more garbage will be in dst message instead of a required
src tail.

The length of dst message is right. The tail of dst message filled with garbage.
Because of memory for dst message is allocated with right size, but didn't filled if
the tail of message partially equals to a beginning of a replacement string.
2018-01-09 12:22:21 +02:00
Rainer Gerhards
393bb03de4 Merge branch 'master' into v8-stable v8.32.0 2018-01-09 11:12:46 +01:00
Rainer Gerhards
77e17df602
Merge pull request #2370 from rgerhards/cid186455
action: fix memory leak when errorfile capability is used
2018-01-09 11:09:47 +01:00
Rainer Gerhards
5fc1b3e926 action: fix memory leak when errorfile capability is used
regression from recent commit c1a601e72f779328994c6c344ef4e7576a57e5c3
Not present in any released code.

Detected by Coverity Scan, CID 186455
2018-01-09 09:45:24 +01:00
Rainer Gerhards
b9cac88204 add global config setting shutdown.enable.ctl-c to enable ctl-c
It can be useful to ctl-c out of rsyslog, even if it is started via
-n, especially inside containers.  The new config setting permits
to enable this capability.

closes https://github.com/rsyslog/rsyslog/issues/533
2018-01-08 18:10:47 +01:00
Rainer Gerhards
d772ab585e Merge branch 'master' into v8-stable 2018-01-08 13:43:19 +01:00