7705 Commits

Author SHA1 Message Date
Rainer Gerhards
e3ff33cbeb testbench: get first elasticsearch test going 2014-09-02 17:58:27 +02:00
Rainer Gerhards
f98a7579e5 testbench: some initial plumbing for Elasticsearch tests 2014-09-01 15:35:32 +02:00
Rainer Gerhards
a3adf18342 maintain ChangeLog 2014-09-01 12:47:54 +02:00
bodik
7d0676e739 imgssapi: log remote peer ip in some error messages 2014-09-01 12:47:08 +02:00
Rainer Gerhards
69ca9210d8 Merge remote-tracking branch 'github/master' 2014-08-29 12:51:10 +02:00
Rainer Gerhards
392d7f304a Merge branch 'v7-stable-bracketing' 2014-08-29 12:44:58 +02:00
Rainer Gerhards
8eccb3cbe0 impstats: add "bracketing" option 2014-08-29 12:44:06 +02:00
Rainer Gerhards
d4e0894593 Merge pull request #108 from chris-martin/typo
fix some typos in comments
2014-08-28 13:28:59 +02:00
Rainer Gerhards
dabf89bbd7 Merge branch 'v8-stable-at-in-varname' into v8-stable
Conflicts:
	ChangeLog
2014-08-27 10:49:46 +02:00
Rainer Gerhards
35fea2df2c remove unnecessary check
In case if it actually is necessary in practice, we need to find
out why, because the property should never be NULL. If this somehow
happens, we need to fix that or find at least a better spot for a
fix.
2014-08-26 14:35:27 +02:00
bodik
6722579707 include remote host ip in some tcp server error messages
Note: this patch is released under ASL 2.0, see:
http://lists.adiscon.net/pipermail/rsyslog/2014-August/038280.html
2014-08-26 13:33:52 +02:00
Rainer Gerhards
049b69a45d Merge pull request #113 from darix/implicit-declaration-for-gettimeofday
GCC complained about implicit declaration of gettimeofday.
2014-08-25 17:46:06 +02:00
Marcus Rückert
de2f1350c6 GCC complained about implicit declaration of gettimeofday. 2014-08-25 17:44:06 +02:00
Rainer Gerhards
21071e15e5 Merge branch 'v8-stable' 2014-08-25 17:08:36 +02:00
Rainer Gerhards
ec6678444e maintain ChangeLog 2014-08-25 17:08:23 +02:00
Rainer Gerhards
87d4757a09 Merge branch 'v7-stable' into v8-stable 2014-08-25 17:07:44 +02:00
Rainer Gerhards
09e4d85360 bugfix: mmanon did not properly anonymize IP addresses starting with '9'
Thanks to defa-at-so36.net for reporting this problem.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529
2014-08-25 17:07:12 +02:00
Jared Johnson
3de72b680a Don't lose uncommitted data on DB retries
Backport ompgsql2 patch to avoid losing uncommitted data on DB retries.

Bugzilla bug for this issue: http://bugzilla.adiscon.com/show_bug.cgi?id=528
Original ompgsql2 patch: http://bugzilla.adiscon.com/show_bug.cgi?id=453#c5
2014-08-22 13:59:23 -05:00
Marcus Rückert
51f28dd41a GCC complained about implicit declaration of gettimeofday. 2014-08-21 17:31:25 +02:00
Rainer Gerhards
6c6186d92c Merge pull request #93 from deymo/tot-imuxsock-shrink
plugins: Remove $(RSRT_LIBS) from imuxsock's LIBADD
2014-08-20 11:41:30 +02:00
Rainer Gerhards
bbd0f01438 remove a couple of gcc --pedantic messages 2014-08-19 16:55:33 +02:00
Rainer Gerhards
09ce215f66 fix build problem on platforms without atomic instructions
Thanks to Michael Biebl for his very helpful analysis of the bug.
2014-08-19 16:04:52 +02:00
Rainer Gerhards
ad0486f014 Merge branch 'v8-stable'
Conflicts:
	ChangeLog
2014-08-19 12:22:10 +02:00
Rainer Gerhards
9ef9420450 clarify status of sm_cust_bindcdr module 2014-08-19 12:16:51 +02:00
Rainer Gerhards
6b47dd542d bugfix: build failure on systems which don't have json_tokener_errors
Older versions of json-c need to use a different API (which don't exists
on newer versions, unfortunately...)
Thanks to Thomas D. for reporting this problem.
2014-08-19 11:33:41 +02:00
Rainer Gerhards
32da924748 permit at-sign in variable names
closes: https://github.com/rsyslog/rsyslog/issues/110
2014-08-19 11:26:12 +02:00
Rainer Gerhards
5665452373 kick off 8.5 branch 2014-08-18 12:38:25 +02:00
Rainer Gerhards
c65c14f031 Merge branch 'v7-stable' into v8-stable 2014-08-18 12:35:36 +02:00
Rainer Gerhards
fe81f1c34b Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable 2014-08-18 12:35:20 +02:00
Rainer Gerhards
500531adaf begin new 8.4 stable branch v8.4.0 2014-08-18 12:14:57 +02:00
Rainer Gerhards
f45e0124ed prepare for 8.3.5 release v8.3.5 2014-08-18 10:49:20 +02:00
Chris Martin
478a799b07 fix some typos in comments 2014-08-06 23:50:25 -04:00
Rainer Gerhards
53fa91d63e Merge pull request #105 from dpocock/master
ommongodb: add sample PyMongo-based script to purge old records
2014-07-29 18:05:28 +02:00
Daniel Pocock
b9c0183b32 ommongodb: add sample PyMongo-based script to purge old records 2014-07-29 14:58:32 +02:00
Rainer Gerhards
03be639642 Merge branch 'v8-stable' 2014-07-25 14:30:57 +02:00
Rainer Gerhards
82e0f591b5 Merge branch 'v7-stable' into v8-stable 2014-07-25 14:30:46 +02:00
Rainer Gerhards
1303d5aea1 Merge branch 'v8-stable' 2014-07-25 09:36:13 +02:00
Rainer Gerhards
b668bf01e0 Merge branch 'v7-stable' into v8-stable 2014-07-25 09:36:03 +02:00
Rainer Gerhards
76e7ee83a4 nitfix: adjust debug log message to new code path 2014-07-25 09:27:56 +02:00
Tomas Heinrich
9b096d7ed6 imuxsock: don't try to set up sockets if there are none configured
This should be the correct version of this commit:
commit 6138ced6ce4abbaccf4c45f7b69a14811feb96ad
imuxsock: don't report an error message for $OmitLocalLogging

And in effect reverts this commit:
commit d77a8b1b8877d2dd1a0248b07564d1f88be00deb
imuxsock: When syssock.use set to off, additional listeners cannot be created
2014-07-25 09:17:04 +02:00
Tomas Heinrich
134fc0cf7a imuxsock: initialize the system socket only if it's in use 2014-07-25 09:16:47 +02:00
Tomas Heinrich
02a83d61f7 imuxsock: initialize system socket params only once
The system socket parameters were initialized twice and most of the
values set at first were overwritten. All the assignments are now
moved to activateListeners(). The parameters aren't accessed before
then.
2014-07-25 09:16:27 +02:00
Rainer Gerhards
7e8d14a922 maintain ChangeLog 2014-07-25 09:08:56 +02:00
Tomas Heinrich
be45099574 bugfix: plug a memleak in imuxsock
Hash table and rate limiter for the system socket weren't freed.

A side-effect was that the "Last message repeated..." notice didn't
get printed if rsyslog was shut down before the repetition was broken.
2014-07-25 09:07:08 +02:00
Tomas Heinrich
7a2e247347 bugfix: plug a memleak in imuxsock
The hash table for the system socket was allocated twice. The other
one being in activateListeners().

This commit practically reverts: 34a77cde2423303da72ab773128a2ddcf41
The issue seems to be that the hash table is not initialized (to NULL)
rather then not being allocated.
2014-07-25 09:06:10 +02:00
Rainer Gerhards
8a0cf248d3 Merge branch 'v8-stable' 2014-07-22 22:52:46 +02:00
Rainer Gerhards
4b1964712c Merge branch 'v7-stable' into v8-stable
Conflicts:
	runtime/ruleset.c
2014-07-22 22:52:29 +02:00
Rainer Gerhards
a811e3386c fix regression (mem leak during normal operations) from commit b7a34ab022b4f427d0a73fc6ac37230e1ca29a84 2014-07-22 22:45:44 +02:00
Rainer Gerhards
0152b9f221 fix regression from commit a955a9900629e2065e3ed1dd9d8f5a94e6faa7f0 2014-07-22 22:11:34 +02:00
Tomas Heinrich
19aa27d3aa bugfix: plug a memleak in rulesetProcessCnf()
Error: RESOURCE_LEAK (CWE-772):
rsyslog-7.4.10/runtime/ruleset.c:984: alloc_arg: "rulesetConstruct(ruleset_t **)" allocates memory that is stored into "pRuleset".
rsyslog-7.4.10/runtime/ruleset.c:729:1: alloc_fn: Storage is returned from allocation function "calloc(size_t, size_t)".
rsyslog-7.4.10/runtime/ruleset.c:729:1: var_assign: Assigning: "pThis" = "calloc(1UL, 56UL)".
rsyslog-7.4.10/runtime/ruleset.c:729:1: noescape: Resource "pThis" is not freed or pointed-to in function "rulesetInitialize(ruleset_t *)".
rsyslog-7.4.10/runtime/ruleset.c:726:1: noescape: "rulesetInitialize(ruleset_t *)" does not free or save its pointer parameter "pThis".
rsyslog-7.4.10/runtime/ruleset.c:729:1: var_assign: Assigning: "*ppThis" = "pThis".
rsyslog-7.4.10/runtime/ruleset.c:985: noescape: Resource "pRuleset" is not freed or pointed-to in function "rulesetSetName(ruleset_t *, uchar *)".
rsyslog-7.4.10/runtime/ruleset.c:638:43: noescape: "rulesetSetName(ruleset_t *, uchar *)" does not free or save its pointer parameter "pThis".
rsyslog-7.4.10/runtime/ruleset.c:1011: leaked_storage: Variable "pRuleset" going out of scope leaks the storage it points to.
2014-07-22 18:30:01 +02:00