rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 15:00:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,583 Commits 67 Branches 505 Tags
Commit Graph

155 Commits

Author SHA1 Message Date
Rainer Gerhards
59565657c0 bugfix: handling of json "null" objects in regard to msgGetJSONPropJSON 
libfastjson returns NULL for json "null" objects, and callers need
to handle this. This is correctly handled in almost all code path
in rsyslog, and this patch fixes theoretical issues in the remaining
two places. Note, however, that a json null object can not really
occur at those places due to the rest of processing. But we
wanted to include the check anyways.

closes https://github.com/rsyslog/rsyslog/issues/600
 2017-05-23 16:23:40 +02:00
Rainer Gerhards
9e848478d0 Merge pull request #1575 from rgerhards/i-1415 
mmdblookup bugfix: multiple memory leaks
 2017-05-22 14:13:20 +02:00
Rainer Gerhards
0407bc8276 mmdblookup bugfix: multiple memory leaks 
There were multiple large memory leaks in mmdblookup, which made
it unusable when used more than lightly.

closes https://github.com/rsyslog/rsyslog/issues/1415
 2017-05-19 17:26:22 +02:00
Rainer Gerhards
3ac9051b12 cosmetic: build system still used JSON_C name 
... but used it for libfastjson. This was a left-over when we
could use both json-c and libfastjson. As github user hdatma
pointed out, this was confusing to users. This has now been
changed to LIBFASTJSON. No functional changes.
 2017-05-16 11:05:57 +02:00
Luca Boccassi
75d5e6ff9e imczmq: if topic is empty subscribe to everything 
ZMQ_SUB supports subscribing to every topic, and it's indicated by an
empty string being passed as a topic.
Fix the config parsing to correctly interpret an empty string passed as
a parameter.
This fixes a regression introduced in 8.19 by commit:
299f5a637f97d2ec064ad3df20fa845ef4b7c7e5
 2017-03-09 20:17:46 +00:00
Luca Boccassi
8ec2edc638 imczmq: do not set SUB/DISH sockets as serverish 
By default it makes sense for ZMQ_SUB and ZMQ_DISH sockets to
connect, as that's the most common use case, unless specified by the
endpoint syntax.
Regression introduced in 8.19 by commit 299f5a637f97d2ec064ad3df20fa8
 2017-03-09 20:13:15 +00:00
Rainer Gerhards
e318309c61 Merge pull request #1357 from GrayTShirt/mmdb-stylecheck 
mmdblookup module cleanup
 2017-01-23 15:37:49 +01:00
Pascal Withopf
b63a6b9010 codestyle: line length adjusted 2017-01-17 08:54:37 +01:00
Dan Molik
591eb7dbc2 Compile ip-lookup module during testing 
- fix clang compilation by switching to BEGINdoAction_nostring
 2017-01-13 13:41:52 -05:00
Dan Molik
6a4b10d861 Cleanup mmdb lookup readme 2017-01-13 08:59:36 -05:00
Dan Molik
f6451bb20b mmdblookup - fix building 
- minor coding style issues.
- fix compiler warnings
  * string const
  * function prototype
- fix compiler error, msg_t -> smsg_t
- fix libfastjson function deprecation.
- drop libjson environments file, as it is extraneous.
 2017-01-12 16:57:24 -05:00
Dan Molik
f24662817c Stylecheck the mmdblookup module 2017-01-12 14:43:06 -05:00
taotetek
cb50f28fa6 Merge pull request #1325 from taotetek/master 
new omczmq features
 2017-01-04 13:28:24 -05:00
Rainer Gerhards
b583093fea Merge pull request #1099 from chenryn/master 
new maxminddb lookup message modify plugin
 2016-12-23 09:39:10 +01:00
Brian Knox
be13aae970 omczmq: more zmq options 2016-12-14 17:44:08 -05:00
Brian Knox
4d0e9f5ccf omczmq: more heartbeat options 2016-12-14 16:55:31 -05:00
Brian Knox
d67805fac9 omczmq: fixes and more debug output 2016-12-14 13:37:33 -05:00
Brian Knox
73806e7f40 omczmq: finish heartbeat support 2016-12-14 12:28:57 -05:00
Brian Knox
d21911b32e omczmq: finish heartbeat support 2016-12-14 12:10:22 -05:00
Brian Knox
a02c4e736c zmq - readme updates 2016-12-14 10:49:25 -05:00
Brian Knox
b6ab69c7b3 omczmq: add support for heartbeats 2016-12-14 10:39:02 -05:00
Brian Knox
020184ea25 omczmq: change key to topic 2016-12-13 09:52:18 -05:00
Brian Knox
97bcb7a282 omczmq: update readme 2016-12-12 15:52:40 -05:00
Brian Knox
78e29730c2 omczmq: RADIO now works 2016-12-12 11:28:01 -05:00
Brian Knox
3976fddd2e omczmq: new socket support 2016-12-11 19:24:16 -05:00
Brian Knox
6d8a5d0ceb omczmq: simplify send routine 2016-12-11 18:38:49 -05:00
Brian Knox
f3763223fd omczmq - support dynatopic with single frame 2016-12-11 16:05:12 -05:00
Brian Knox
2523224d84 omczmq: more dynakey work 2016-12-11 11:47:22 -05:00
Brian Knox
31ed55a1b4 omczmq: working on dynakey support 2016-12-11 09:38:15 -05:00
purnima
d45daa2af0 Rebase,redefine msgDestruct() as smsg_t is used 2016-11-22 14:24:25 +05:30
Bob Gregory
f50c0e55be Redis dynakey 
This commit adds a dynakey attribute to omhiredis configuration.

The dynakey attribute provides the name of a template that should be
used to create the publish key or list name when sending log entries to
redis.
 2016-11-06 08:01:58 +00:00
zacharyzhao
b31f40be37 Fix an incorrect spelling of mmgrok's README.md 
This incorrect spelling may confusing people who follows `README.md`'s
instruction.
 2016-11-02 18:00:17 +08:00
Rainer Gerhards
448f16495c remove "inline" attribute from excessivly long functions 2016-10-26 11:50:15 +02:00
Francisco Castro
9ef50fa710 Add test case for OmTcl 2016-10-11 14:49:58 +02:00
Francisco Castro
c2aabea934 Add initial untested version of the Tcl output module 2016-10-11 14:49:58 +02:00
Rainer Gerhards
4bdd2142b0 Merge branch 'master' of https://github.com/patelritesh/rsyslog into merge-1152 2016-10-05 16:09:35 +02:00
Ritesh Patel
dc2274861a patch to handle "From " in AIX forwarded messages. 
if syslog in AIX started with "-s" option, AIX syslog adds only "From " instead of "Message forwarded from "
 2016-09-24 17:12:54 -04:00
Bob Gregory
2ec1ad26ee Omhiredis now reconnects to redis after failure 
* We check for the connection state when receiving replies
  so that we don't try to free(NULL)
* We now close the redis connection if we fail to send logs, which
  causes us to reconnect in tryResume
* Cleaned up the freeReply code in endTransaction and dropped the
  replies array since it isn't actually used.
 2016-09-13 16:28:58 +01:00
chenryn
e1edf31cf0 new maxminddb lookup plugin 2016-07-26 17:11:51 +08:00
Kenneth Giusti
1586178f29 omamqp1: update to remove deprecated proton calls 2016-06-11 16:51:31 -04:00
Kenneth Giusti
1ac84781c7 omamqp1: bugfix - supply port number to message bus address 2016-06-11 16:27:04 -04:00
Rainer Gerhards
6dfdaaf24d mmsequence: fix data types 2016-06-01 10:53:23 +02:00
Rainer Gerhards
c4a8f2819c omhttpfs: fix compiler warnings 2016-06-01 10:49:21 +02:00
Rainer Gerhards
837c9203d5 omhttpfs: solve clang static analyzer issue 
fix a more or less cosmetic complaint
 2016-05-20 10:46:22 +02:00
Brian Knox
e6c6ed1169 zeromq: code cleanup 2016-05-15 10:06:36 -04:00
Brian Knox
0fc63924ef imczmq: curve client support for input 2016-05-13 14:09:12 -04:00
Brian Knox
a1fe59abd8 imczmq: code cleanup 2016-05-13 13:52:42 -04:00
Brian Knox
bedbbebc23 zeromq: allow imczmq to work with bad options 2016-05-13 13:38:47 -04:00
Brian Knox
5ed8623e67 zeromq: style consistency cleanup 2016-05-13 07:06:42 -04:00
Brian Knox
7f6da6456a zeromq: support no auth and multi frame 2016-05-13 06:49:31 -04:00