8640 Commits

Author SHA1 Message Date
4759603f7d testbench: Added mmpstrucdata valgrind tests into makefile
Tests and config files were not included in the makefile,
so they were not added into the release tar.gz file.

closes: https://github.com/rsyslog/rsyslog/issues/484
2015-08-17 07:03:34 -07:00
2c89e0090f Merge branch 'Whissi-issue_479' into master-candidate 2015-08-13 06:09:43 -07:00
Thomas D
ac3e7d316e Fix: Parallel build issue "cannot find ../runtime/.libs/librsyslog.a: No such file or directory" (Fixes #479)
This issue was introduced with commit fb4fd2ddd2f08380ad65a8cafc5f124890b136ad.
2015-08-13 17:50:36 +02:00
4484b6b697 maintain Changelog 2015-08-10 09:30:54 -07:00
bb7660c7da Merge branch 'janmejay-master' into master-candidate 2015-08-10 09:26:59 -07:00
6977539642 Merge branch 'master' of https://github.com/janmejay/rsyslog into janmejay-master 2015-08-10 09:25:05 -07:00
62fa2755fb bump version number 2015-08-10 05:23:28 -07:00
dc84028fdd prepare for rsyslog 8.12.0 release v8.12.0 2015-08-10 05:04:42 -07:00
53c019d36d Merge branch 'alorbach-freebsd-console-fix' into master-candidate 2015-08-07 00:43:27 -07:00
39f8df9ad5 maintain Changelog 2015-08-07 00:43:06 -07:00
b1b5a820ca Merge branch 'freebsd-console-fix' of https://github.com/alorbach/rsyslog-1 into alorbach-freebsd-console-fix 2015-08-07 00:39:14 -07:00
6492b67074 Merge branch 'radosroka-tmp_master' into master-candidate 2015-08-07 00:34:06 -07:00
a91f05471f maintain ChangeLog 2015-08-07 00:33:08 -07:00
Janmejay Singh
afb92f4fea This fixes a bug which allowed omkafka to get into a state where it wouldn't accept any new messages for publishing.
It also fixes a bug which whould manifest only when using dyntopic and when producer is in i-won't-accept-new-messages state, and caller tries to produce a new message. The dyn-topic-lock wouldn't be unlocked (because of premature fail-jump).

If you know librdkafka at a high level and are interested in details, here is a more detailed explaination:
So 'rk' tries to bound number of objects in flight by maintaining a counter, the max-value of which defaults to 100k. When a new message comes in, it rejects it if it already is at max-messages-in-flight. Now this counter is decremented (and in-flight-msg memory is freed) in callback-poll (which picks things from reply-queue, rd_kafka_op_t for delivery-ack op). If we don't poll when we are already at max-in-flight-messages and there is no poll in flight, it'll basically drain all 100k in-flight message and then start idling (because rk->rk_u.producer->msg_cnt still thinks it has 100k messages in flight, and delivery-acks are yet to be handled, but of-course no one handles them).
2015-08-07 09:15:49 +05:30
Radovan Sroka
1d200da82c Fix generating rscryutil.1
In commit 3b13693 commiter uses variable before executing another block of code which sets this variable and any changes in that block won't apply.
This bug appears when user runs "make dist" in the git repo and the generated tarball doesn't contain rscryutil.1.
2015-08-06 16:18:56 +02:00
aed4f6bba7 freebsd: Added a patch for console output on freebsd
The patch was from AlexandreFenyo and is a result
of this bug report on freebsd.org:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199767#c4

closes https://github.com/rsyslog/rsyslog/issues/372
2015-08-06 13:57:58 +00:00
50cd3174c6 Merge branch 'karibou-issue_445_fix_syscall_caller_compilation' into master-candidate 2015-08-04 06:41:40 -07:00
f337b638e8 Merge branch 'issue_445_fix_syscall_caller_compilation' of https://github.com/karibou/rsyslog into karibou-issue_445_fix_syscall_caller_compilation
Conflicts:
	tests/imuxsock_ccmiddle.sh
	tests/imuxsock_ccmiddle_root.sh
	tests/imuxsock_hostname.sh
	tests/imuxsock_traillf.sh
	tests/imuxsock_traillf_root.sh
2015-08-04 06:11:21 -07:00
e86d243379 Merge branch 'alorbach-freebsd-addbash' into master-candidate 2015-07-31 05:53:46 -07:00
d73cc1a8b7 maintain ChangeLog 2015-07-31 05:53:20 -07:00
df3d4a3922 test-suite: Added !#/bin/bash into all test scripts.
Most of the tests will not work in other default shells like
on Freebsd or Solaris. So we make /bin/bash default now.
2015-07-30 15:38:17 +00:00
ce560b6323 build system: Failure action in AC_CHECK_LIB check for gnutls_global_init changed
Instead of an failure, only a warning message is generated now.
On Freebsd the function check does not detect the gnutls_global_init
proberly. This caused configure to fail even if gnutls was installed.
2015-07-28 13:03:36 +00:00
Rainer Gerhards
8559c4ba95 Merge branch 'tmp-merge' into master-candidate 2015-07-28 12:20:32 +02:00
Rainer Gerhards
749bfd60e9 maintain ChangeLog 2015-07-28 12:19:34 +02:00
Rainer Gerhards
ca91414212 maintain ChangeLog 2015-07-28 12:12:03 +02:00
Rainer Gerhards
b276665ea9 fix C++ comment
C++ comments do not work in C on all platforms
2015-07-28 12:09:23 +02:00
Rainer Gerhards
86d2aa713e Merge branch 'patch-1' of https://github.com/antmat/rsyslog into tmp-merge 2015-07-28 12:05:57 +02:00
Rainer Gerhards
4e8c87c045 Merge branch 'freebsd-rscryutil-manfix' of https://github.com/alorbach/rsyslog-1 into master-candidate 2015-07-28 12:04:14 +02:00
Rainer Gerhards
cf84fa4d40 Merge branch 'master-dynafiles' of https://github.com/theinric/rsyslog into master-candidate 2015-07-28 12:02:35 +02:00
Rainer Gerhards
89fbd041d6 Merge branch 'master-sanitizemsg' of https://github.com/theinric/rsyslog into master-candidate 2015-07-28 12:02:02 +02:00
Rainer Gerhards
abccd65b9e Merge branch 'regex-hakman' into master-candidate 2015-07-28 11:13:12 +02:00
Rainer Gerhards
841d8a03a0 maintain ChangeLog 2015-07-28 10:51:27 +02:00
Rainer Gerhards
ff53b5acc4 Merge branch 'master' of https://github.com/schiele/rsyslog into master-candidate 2015-07-28 10:49:47 +02:00
Rainer Gerhards
b0454b5ec0 maintain ChangeLog 2015-07-28 10:43:45 +02:00
Rainer Gerhards
ba258875de cleanup no longer needed debug log messages 2015-07-28 10:39:59 +02:00
Rainer Gerhards
61ad1cdaeb Merge branch 'multiline_init_check' of https://github.com/hakman/rsyslog into regex 2015-07-28 10:31:31 +02:00
Rainer Gerhards
3ca81a0b04 Merge branch 'imfile-inotify-deletedfiles' of https://github.com/alorbach/rsyslog-1 into master-candidate 2015-07-28 10:19:45 +02:00
Rainer Gerhards
88f06516b5 bugfix: ommysql did not work when gnutls was enabled
as it turned out, this was due to a check for GnuTLS functions
with the side-effect that
AC_CHECK_LIB, by default, adds the lib to LIBS, if there is no
explicit action, what was the case here. So everything was now
linked against GnuTLS, which in turn made ommysql fail.

Thanks to Thomas D. (whissi) for the analysis of the ommysql/gnutls
problem and Thomas Heinrich for pointing out that AC_CHECK_LIB might
be the culprit.
2015-07-27 16:59:17 +02:00
Rainer Gerhards
f57e7bcee8 fix last merge -- somehow a variable access was left over 2015-07-27 14:51:59 +02:00
Rainer Gerhards
169f7eb35c Merge branch 'master-imfile-var' of https://github.com/theinric/rsyslog into master-candidate 2015-07-27 14:30:19 +02:00
3b13693430 Tools: Man pages for tools were generated even with --disable-generate-man-pages
Man pages are not generated anymore when "--disable-generate-man-pages" is
configured. Also changed man-page rulepatterns makefile. The method
using $< refering to the prerequisite did not work proberly on FreeBSD.

closes https://github.com/rsyslog/rsyslog/issues/387
2015-07-24 10:21:58 +00:00
1308b3700e imfile: Added IN_MOVED_FROM handling into inotify dir watch.
IN_MOVED_FROM are now handeled properly. When a file is moved
out of the watched directory, inotify_rm_watch is called and
the file is being removed wdMap table.

closes https://github.com/rsyslog/rsyslog/issues/324
2015-07-21 04:42:38 -07:00
f8864ce8c1 imfile: Fixed not deleting listener data bug when using
wildcards in filenames. The bug was introduced by
	this fix ad08057039
2015-07-20 06:26:48 -07:00
Tomas Heinrich
ce1e9f5f3e Fix race-condition detection in path-creation code
It appears the detection never actually worked due to wrong error
checking. errno needs to be checked to determin the reason for the
failure.
2015-07-18 22:05:28 +02:00
Tomas Heinrich
80f42190a9 Remove redundant code 2015-07-18 22:05:28 +02:00
Tomas Heinrich
008f0097b6 Prevent a segfault in dynafile creation
A failure during the dynafile creation (in prepareFile(), most of the
time) led to a misaddressing and a segfault.
2015-07-18 22:04:25 +02:00
Rainer Gerhards
293771d938 maintan ChangeLog 2015-07-17 14:51:13 +02:00
Rainer Gerhards
0c9b810f34 Merge branch 'imfile-filetable-fix' of https://github.com/alorbach/rsyslog-1 into master-candidate 2015-07-17 14:49:58 +02:00
ad08057039 imfile: Fixed file table corruption when monitoring single files
When monitoring single files in inotify mode, a corruption of the
configuration filetable happened when the file was deleted.
The Active and Configuration table are sharing the same Listener
object when monitoring a single file. We check if the listener
object is present in the configured filetable before we delete it now.

closes https://github.com/rsyslog/rsyslog/issues/392
2015-07-17 04:45:16 -07:00
Louis Bouchard
f21b3f96f7 Fix tests bashism so the tests do run when lib enabled
Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>
2015-07-17 12:43:06 +02:00