1766 Commits

Author SHA1 Message Date
Jan Gerhards
c9b58411fd remove several unneded cat commands
detected by codacy
2018-10-12 16:08:24 +02:00
Rainer Gerhards
03933e84cf
cosmetic fix: mangle_qi test tool did not check mandatory arg 2018-10-11 18:49:54 +02:00
Rainer Gerhards
67bdd0d51b cosmetic: remove useless use of cat 2018-10-11 13:32:14 +02:00
Rainer Gerhards
5c7ad3ba85
Merge pull request #3110 from alorbach/imrelp-oldstylefix
imrelp: Fixed issue with oldstyle configuration caused by commit:
2018-10-11 12:31:07 +02:00
Rainer Gerhards
9ac34acf2e
Merge pull request #3114 from jgerhards/utf8Test
mmutf8fix: add test for no error
2018-10-11 11:11:53 +02:00
Rainer Gerhards
91309f487d
Merge pull request #3113 from rgerhards/shutdown-race
bugfix core: potential hang on rsyslog termination
2018-10-10 22:35:08 +02:00
Jan Gerhards
3479ea76ff mmutf8fix: add test for no error
closes https://github.com/rsyslog/rsyslog/issues/3070
2018-10-10 19:06:45 +02:00
Rainer Gerhards
41ee00e569 bugfix core: potential hang on rsyslog termination
The root cause was a deadlock during worker startup. This could
happen for example when a DA queue needed to persist data during
shutdown.

Fail condition:
* startup request for a new worker
* initialization of that worker
* immediate detection that the worker can or must shutdown
* main thread waiting for worker running state, which it skips,
  and so the main thread hangs inside a loop

closes https://github.com/rsyslog/rsyslog/issues/3094
2018-10-10 16:51:24 +00:00
Rainer Gerhards
9378945b9d
fix useless use of cat
more or less cosmetic here, but anyhow...

detected by shellcheck
2018-10-10 15:20:15 +02:00
f53977817f imrelp: Fixed issue with oldstyle configuration caused by commit:
32b71daa8a

Fixed by setting bEnableLstn in addInstance().

Closes https://github.com/rsyslog/rsyslog/issues/3106
2018-10-09 14:31:52 +02:00
Rainer Gerhards
e7519b238e
Merge pull request #3102 from rgerhards/cat2
cosmetic: replace useless use of cat
2018-10-02 21:30:14 +02:00
a71c8918fe
Merge pull request #3101 from alorbach/kafka-testbench-changes
testbench: Hardened Kafka / Zookeeper shutdown functions
2018-10-02 10:14:50 +02:00
Rainer Gerhards
f1a3d84c22
Merge pull request #3098 from rgerhards/tb-keyprog
QA: add test for queue.cry.keyprogram parameter
2018-10-01 18:41:42 +02:00
Rainer Gerhards
3120ec8906
Merge pull request #3099 from rgerhards/tb-shebang
testbench: add missing shebangs
2018-10-01 17:23:22 +02:00
bae734abdd testbench: Changed kafka server to kafka_2.11-2.0.0.tgz
Also adjusted some kafka server settings related to log retention.
Hardened stop function for kafka and zookeeper.
See also https://github.com/rsyslog/rsyslog/issues/3057
2018-10-01 17:06:47 +02:00
Rainer Gerhards
0eae11430b
cosmetic: replace useless use of cat 2018-10-01 14:54:02 +02:00
Rainer Gerhards
2f32d72cdc
testbench: remove unused Python module (import)
detected by PyLint
2018-10-01 12:03:15 +02:00
Rainer Gerhards
e551642316 testbench: add missing shebangs
detected by shellcheck
2018-10-01 12:00:31 +02:00
Rainer Gerhards
07f2c40de5
QA: add test for queue.cry.keyprogram parameter 2018-10-01 11:53:28 +02:00
Rainer Gerhards
82d90c3dc6
Merge pull request #3095 from rgerhards/tb-keyfile
QA: add test for queue.cry.keyfile parameter
2018-10-01 10:42:03 +02:00
Rainer Gerhards
2e05168275
Merge pull request #3096 from rgerhards/tb-diag-backticks
cleanup: replace legacy bash backticks by current $() syntax
2018-10-01 09:31:33 +02:00
Rainer Gerhards
dabc8628b4
Merge pull request #3089 from rgerhards/tb-timeout
testbench: improve shutdown timeout diagnostics
2018-10-01 08:19:21 +02:00
Rainer Gerhards
2e1d2de2fc
fix bug in my previous commit
as the kafka tests failed so frequently, I overlooked that I
actually broken one...
2018-09-30 23:05:28 +02:00
Rainer Gerhards
70f85d2fed
cleanup: replace legacy bash backticks by current $() syntax
no functional changes
2018-09-30 19:17:27 +02:00
Rainer Gerhards
d2057ba36e
QA: add test for queue.cry.keyfile parameter 2018-09-30 19:12:08 +02:00
Rainer Gerhards
f4883fb2d9
testbench: improve shutdown timeout diagnostics 2018-09-30 19:04:38 +02:00
Rainer Gerhards
95a2d4043c
Merge pull request #3090 from rgerhards/tb-kafka-broker
testbench: detect kafka broker failure and skip test if so
2018-09-30 11:30:53 +02:00
Rainer Gerhards
650ec84c56
testbench: detect kafka broker failure and skip test if so
Nothing in our code has to do with the failure...

see also https://github.com/rsyslog/rsyslog/issues/3088
2018-09-30 08:55:15 +02:00
Rainer Gerhards
17ca039b44
clenup: useless use of cat (cosmetic) 2018-09-28 21:17:52 +02:00
Rainer Gerhards
9dead7c040
Merge pull request #3081 from rgerhards/i2575
bugfix queue subsystem: DA queue did ignore encryption settings
2018-09-28 17:54:51 +02:00
Rainer Gerhards
e01e74dcc9
bugfix queue subsystem: DA queue did ignore encryption settings
This commit fixes the bug and adds a new test to check the functionality.

closes https://github.com/rsyslog/rsyslog/issues/3066
closes https://github.com/rsyslog/rsyslog/issues/2575
2018-09-28 14:09:13 +02:00
Rainer Gerhards
8cbeb6305c
testbench: add test for encrypted disk queue
see also https://github.com/rsyslog/rsyslog/issues/3066
2018-09-28 11:24:04 +02:00
Rainer Gerhards
1bed4c986d
Merge pull request #3079 from rgerhards/tb-expected
testbench: work around shellcheck false positive
2018-09-28 10:27:07 +02:00
Rainer Gerhards
73e8182b24
testbench: modernize shutdown_immediate command 2018-09-28 10:10:32 +02:00
Rainer Gerhards
dc93feee72
testbench: work around shellcheck false positive
shellcheck does not do deep inspection and so does not see that
we use the EXPECTED variable. Let's help it understand this is
valid. This doesn't really cost us something, but it helps us
enforce useful policies (in many other cases this may be a valid
error indication).
2018-09-28 08:11:37 +02:00
Rainer Gerhards
25749144ed
Merge pull request #3078 from rgerhards/tb-pipeopt
testbench: remove useless "cat" command (cosmetic)
2018-09-27 19:10:19 +02:00
Rainer Gerhards
0e3dfd5520
Merge pull request #3077 from rgerhards/i3064
testbench: re-enable test sndrcv_relp_dflt_pt.sh
2018-09-27 19:09:21 +02:00
Rainer Gerhards
91ca47774b Merge remote-tracking branch 'al/imfile-testbench-issues2' into tmp 2018-09-27 19:02:42 +02:00
Rainer Gerhards
e929ee7220
Merge pull request #3051 from rgerhards/i1605
bugfix imfile: file change was not reliably detected
2018-09-27 16:03:58 +02:00
Rainer Gerhards
cffc60b416
testbench: remove useless "cat" command (cosmetic) 2018-09-27 12:06:20 +02:00
Rainer Gerhards
d6be99a85f
testbench: re-enable test sndrcv_relp_dflt_pt.sh
Test was originally only executed when root tests were enabled,
which routinely was not the case. There was not even a hard reason
to handle it that way. Also, the test had a couple of defects which
have also been fixed.

closes https://github.com/rsyslog/rsyslog/issues/3064
2018-09-27 11:57:47 +02:00
Rainer Gerhards
98b03eec68
Merge pull request #3061 from jgerhards/omsmpTest
testbench: add simple omsnmp test
2018-09-27 11:51:43 +02:00
Rainer Gerhards
f85ef7aabc
bugfix imfile: file change was not reliably detected
A change in the inode was not detected under all circumstances,
most importantly not in some logrotate cases.

Includes new tests made by Andre Lorbach. They now use the
logrotate tool natively to reproduce the issue.
2018-09-27 10:00:57 +02:00
Jan Gerhards
3fc7a66855 testbench: add simple omsnmp test
currently only checks if module is loaded and checks for
required parameters correctly
2018-09-27 09:03:28 +02:00
Rainer Gerhards
ca7c2db21a
Merge pull request #3062 from rgerhards/disable-kafka
testbench: skip sndrcv_kafka.sh as it fails quite frequently
2018-09-26 21:54:37 +02:00
Rainer Gerhards
cfc89b5198
Merge pull request #3054 from rgerhards/ci-cleanup-kafka
CI: clean hanging kafka and zookeeper instances on test startup
2018-09-26 10:57:16 +02:00
Rainer Gerhards
de8a51d745
Merge pull request #3059 from rgerhards/i3057
testbench: restart kafka if brokers do not come up
2018-09-26 10:46:44 +02:00
Rainer Gerhards
be88295442
testbench: skip sndrcv_kafka.sh as it fails quite frequently
see also https://github.com/rsyslog/rsyslog/issues/3057
2018-09-26 10:45:35 +02:00
Rainer Gerhards
5e11cecb3b
testbench: restart kafka if brokers do not come up
kafka tests are plagued by brokers failing to start, which then causes
(false positive) test failures.

We now to detect missing brokers, and do a kafka/zookeepr shutdown and
restart in this case. If that fails again, let's skip the test instead
of failing it - after all, it's not the issue of the to-be-checked code.

see also https://github.com/rsyslog/rsyslog/issues/3057
2018-09-26 08:41:41 +02:00
Jan Gerhards
94a0e7599d testbench: add very basic ommail test
not a very good test at the moment, but still better than none at all.
2018-09-25 17:54:21 +02:00