12127 Commits

Author SHA1 Message Date
Rainer Gerhards
31219c6a6d fix missing header guard
detected by lgtm.com static analyzer
2018-03-16 19:06:43 +01:00
Rainer Gerhards
4cba3c8b20 fix invalid HTML header in JavaScript
detected by lgtm.com static analyzer
2018-03-16 19:03:03 +01:00
Rainer Gerhards
db7b8f07c1 remove dead code
Expression is actually constant under given code. To be on the safe
side for future code changes, I put in a guard assert().

detected by lgtm.com static analyzer
2018-03-16 18:58:11 +01:00
Rainer Gerhards
edf7c7145b
Merge pull request #2548 from sjvs/add-lgtm.yml-for-lgtm.com
Add lgtm.yml configuration for analysis on lgtm.com
2018-03-16 17:23:17 +01:00
Bas van Schaik
dabb7b7231 Add lgtm.yml configuration for analysis on lgtm.com 2018-03-16 16:06:51 +00:00
Rainer Gerhards
a56ba762eb
Merge pull request #2522 from deoren/changelog-param-fix
Changelog: Fix config.enabled parameter name
2018-03-15 14:18:13 +01:00
Rainer Gerhards
b2067393d6
Merge pull request #2539 from jgerhards/rscript-Ptr
rscript: refactor to use function pointers for script functions
2018-03-15 14:17:46 +01:00
Rainer Gerhards
ce88147209 testbench: activate new test now that fix is present 2018-03-15 13:25:17 +01:00
Rainer Gerhards
c55f37ef71 bugfix/imfile: memory leak in readMode 0
Bug is actually in stream object, but currently exposed only via imfile.
Happens when in readMode 0 a partial line is read and no more data is
present in the file during that iteration. One partial message is lost
in this case.

closes https://github.com/rsyslog/rsyslog/issues/2421
2018-03-15 13:23:26 +01:00
Rainer Gerhards
fba936b0b1 testbench: add testcase for memory leak in stream class
Bug is currently exposed only via imfile. Happens when in readMode 0 a
partial line is read and no more data is present in the file during
that iteration. One partial message is lost in this case.

Note: this just adds the test, but does not activate it. Activation
shall happen after fix is crafted.

see also https://github.com/rsyslog/rsyslog/issues/2421
2018-03-15 13:22:31 +01:00
Hans Rakers
b617456a48 Fix wrong order of arguments for errmsg 2018-03-15 10:49:56 +01:00
Jan Gerhards
89e16c53dc rscript: refactor to use function pointers for script functions
calling and identifying a script function now works via
a function pointer. Going forward, this will be used when
making loadable functions in rainerscript.
2018-03-14 09:33:13 +01:00
Kasumi Hanazuki
2ea7d7eef1 tests/glbl-umask.sh: Improve test stability
This patch improves the stability of tests/glbl-umask.sh, which now fails
when running after tests/rawmsg-after-pri.sh, since the glob pattern rsyslog.o*
matches rsyslog.out.compare, created by rawmsg-after-pri.sh.
2018-03-09 14:12:59 +09:00
Kasumi Hanazuki
907882a241 tests/Makefile: Fix broken TESTS
This patch fixes the list of TESTS, broken by a line without the backslash
introduced in Commit 87f296fd2e667e95f38991a8a7caf84c3458e7c9.
2018-03-09 13:23:32 +09:00
Rainer Gerhards
07d649d765
Merge pull request #2515 from jgerhards/script-refactor
rscript: refactor all functions
2018-03-08 09:24:53 +01:00
Deoren Moor
b24b002527
Changelog: Fix config.enabled parameter name
Fix two instances of the wrong name.

refs rsyslog/rsyslog#2521
2018-03-08 01:22:26 -06:00
Rich Megginson
17e29c2894 omelasticsearch - add support for CA cert, client cert auth
This allows omelasticsearch to perform client cert based authentication
to Elasticsearch.
Add the following parameters:
`tls.cacert` - Full path and filename of the file containing the CA cert
               for the CA that issued the Elasticsearch server(s) cert(s)
`tls.mycert` - Full path and filename of the file containing the client
               cert used to authenticate to Elasticsearch
`tls.myprivkey` - Full path and filename of the file containing the client
                  key used to authenticate to Elasticsearch
2018-03-06 14:42:29 -07:00
Jan Gerhards
ae79fba280 rscript: refactor all functions
this is to estabilsh a common interface for all rainerscript functions
to enable calling them via function pointer (to be done
at a later stage).
2018-03-06 17:01:20 +01:00
Rainer Gerhards
645975c73a
Merge pull request #2511 from rgerhards/travis-save-time
testbench: do not run some DB tests twice in split test runs
2018-03-05 17:42:10 +01:00
Rainer Gerhards
4fcfff5cd5 testbench: do not run some DB tests twice in split test runs
we can split the testbench into two test runs in order to make each of them complete
quicker (this currently is required for Travis, but may also be useful for other
cases). Some test are run twice in this scenario, which is obviously counter-productive.
We ensure now that at least some longer-running database tests are only executed
once in this setup.
2018-03-04 17:44:27 +01:00
Rainer Gerhards
08efa27d0a
Merge pull request #2501 from rgerhards/fix-ci-tarball
CI: fix check that tarball is built correctly
2018-03-04 12:53:23 +01:00
Rainer Gerhards
e303fda3df build system: pgsql tests are not in tarball
The build system does not properly include the pgsql tests and
support files into the tarball (EXTRA_DIST).
2018-03-04 11:09:13 +01:00
Rainer Gerhards
a28fbd3340 CI: fix check that tarball is built correctly 2018-03-04 11:09:13 +01:00
Rainer Gerhards
e53b62336e maintain ChangeLog 2018-03-04 11:08:37 +01:00
Rainer Gerhards
58ef1039fd
Merge pull request #2510 from rgerhards/buildbot-docker-statan
Buildbot docker statan
2018-03-04 11:05:15 +01:00
Rainer Gerhards
64a222169e Merge branch 'master' of https://github.com/rsyslog/rsyslog 2018-03-04 10:21:50 +01:00
Rainer Gerhards
103e4f5adb
Merge pull request #2492 from deoren/changelog-tweak
ChangeLog: Fix parameter name
2018-03-04 10:21:38 +01:00
Rainer Gerhards
cd38e5460f devcontainer: use some sensible defaults if params not set 2018-03-03 17:51:02 +01:00
Rainer Gerhards
7cbd89a222 bump version number to 8.34.0.master again
as the merge from v8-stable reset it to 8.33.0, which is not correct
for master
2018-02-28 13:11:25 +01:00
Rainer Gerhards
06a2cf63ad Merge branch 'fix-include-obj-text-from-string-test' of https://github.com/Whissi/rsyslog into whissi 2018-02-28 13:09:49 +01:00
Thomas Deutschmann
38fff0e757
tests/Makefile: Fix EXTRA_DIST and add testsuites/include-std-omfile-action.conf
This commit fixes EXTRA_DIST list which was broken via commit
87f296fd2e667e95f38991a8a7caf84c3458e7c9.

In addition, this commit adds the missing testsuites/include-std-omfile-action.conf file
to EXTRA_DIST.

Fixes: https://github.com/rsyslog/rsyslog/issues/2493
2018-02-20 21:44:27 +01:00
deoren
bbbcfc14f4 ChangeLog: Fix parameter name
refs rsyslog/rsyslog#2482
2018-02-20 10:00:51 -06:00
Rainer Gerhards
a11719a3bc bumping version number for new dev cycle 2018-02-18 14:17:44 +01:00
Rainer Gerhards
504ba8397c Merge branch 'master' into v8-stable v8.33.0 2018-02-18 14:07:14 +01:00
Rainer Gerhards
8d0d067d07
Merge pull request #2485 from jgerhards/errmsg-parser
parser: use new ermsg interface
2018-02-17 15:52:03 +01:00
Jan Gerhards
b742cf4b3e parser: use new ermsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-02-16 13:10:18 +01:00
Rainer Gerhards
1f82e5cc31 maintain ChangeLog 2018-02-16 10:13:26 +01:00
Rainer Gerhards
21c709a45c
Merge pull request #2475 from rgerhards/i2347
template: add option to generate json "container"
2018-02-16 10:09:57 +01:00
Rainer Gerhards
ee70c75182 bugfix: strndup() compatibility layer func copies too much
The function did not obey the upper limit, effectively becoming
a strdup(). This was only noticed when the compatibility layer
was required, most importantly on Solaris 10.
2018-02-16 08:36:24 +01:00
Rainer Gerhards
93bebb1f1f template: add option to generate json "container"
This enables easy JSON generation via template.

This commit also corrects an issue with the constant "jsonf"
format. That was recently added, and the implementation problem
only became visible when used inside a larger json object. No
officially released code is affected, thought - so it rellay
is just a side-note.

closes https://github.com/rsyslog/rsyslog/issues/2347
2018-02-16 08:22:49 +01:00
Rainer Gerhards
cb20a2dbc2
Merge pull request #2483 from rgerhards/i2482
fix global parameter name shutdown.enable.ctl-c
2018-02-16 08:19:17 +01:00
Rainer Gerhards
c9fa875c44 fix global parameter name shutdown.enable.ctl-c
the config system actually does not permit "-" inside parameter
names. This has now been changed to "shutdown.enable.ctlc".

Note: this was never released and only present in 8.33 pre-release
versions.

closes https://github.com/rsyslog/rsyslog/issues/2482
2018-02-15 18:44:32 +01:00
Rainer Gerhards
4893d0a013 maintain ChangeLog 2018-02-14 08:20:51 +01:00
Rainer Gerhards
0d122c64fd
Merge pull request #2455 from PascalWithopf/omstdout_new_config_style
omstdout: add new configuration format
2018-02-14 08:19:05 +01:00
Rainer Gerhards
b5dfe3dc13 maintain ChangeLog 2018-02-12 16:00:12 +01:00
Rainer Gerhards
537cec5fce
Merge pull request #2459 from rgerhards/i2348
core/template: add format jsonf to constant template entries
2018-02-12 15:59:08 +01:00
Rainer Gerhards
c9f00b9f8c
Merge pull request #2474 from jgerhards/errmsg-nsdpoll_ptcp
nsdpoll_ptcp: use new errmsg interface
2018-02-12 15:26:43 +01:00
Rainer Gerhards
55d537e218
Merge pull request #2470 from rgerhards/f2450
lmsig_ksils12: emit error message if chown() to sig file fails
2018-02-12 10:03:02 +01:00
Jan Gerhards
0cb86d6ee1 nsdpoll_ptcp: use new errmsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-02-12 09:21:10 +01:00
Rainer Gerhards
d4624590ad
Merge pull request #2460 from bbigras/patch-1
Fix typo rsyslogd.8
2018-02-12 08:32:15 +01:00