121 Commits

Author SHA1 Message Date
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
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
Brian Knox
299f5a637f czmq: updates for imczmq and omczmq plugins 2016-05-12 14:05:05 -04:00
Rainer Gerhards
accfa81e5d cleanup: remove compatibility checks for old json-c
as we now use libfastjson, we do no longer need to check for "new"
features, as these are always present in libfastjson (things
like json_object_object_get_ex()).

closes https://github.com/rsyslog/rsyslog/issues/935
2016-04-05 12:16:09 +02:00
Rainer Gerhards
703c946e09 omhttpfs: code cleanup
* fix C++ style comments
* remove commented-out code

closes https://github.com/rsyslog/rsyslog/issues/677
2016-03-30 17:02:17 +02:00
Manohar Ht
631a45b322 Support for authenticated redis database. 2016-03-20 10:44:07 +05:30
Rainer Gerhards
35e9e6a2cd omhiredis: serverport config parameter did not reliably work
depended on environment/compiler used to build
2016-03-01 17:28:25 +01:00
Kenneth Giusti
a86da063b1 fix typo in apt-get-repository 2016-02-22 13:00:59 -05:00
Kenneth Giusti
5a005b7c3e Update the documentation with instructions for installing Proton packages. 2016-02-22 11:49:04 -05:00
Kenneth Giusti
cf5c020bb1 Fix clang compilation warnings 2016-02-17 15:44:40 -05:00
Kenneth Giusti
ebe27e8368 Output Module for AMQP 1.0-compliant brokers 2016-02-15 14:21:46 -05:00
Rainer Gerhards
261e124d64 mmsequence: fix compiler warnings
by using new interface macros; this resolves potential alignment
issues.
2016-01-27 11:21:08 +01:00
Rainer Gerhards
740dc44202 fix or suppress compiler warnings 2016-01-26 18:25:38 +01:00
7474c61920 imjournal: Fixed problem in function timeval2syslogtime function call
Problem was introduced by changes in timeval2syslogtime api, see
following commit:
e8c8e96e27

Same problem was in imkmsg.c
2016-01-22 14:34:52 +01:00
xushengping
ffbc08766d Update imzmq3.c 2016-01-14 11:41:48 -05:30
xushengping
44fac0e227 fix bug :Memory leak
here shoud free subscribes , becase   CHKiRet(parseSubscriptions(es_str2cstr(pvals[i].val.d.estr, NULL),  &inst->subscriptions)) have no way to free
the memory which malloc by es_str2cstr
2016-01-14 11:41:47 -05:30
Rainer Gerhards
6022144b21 Merge branch 'master' of https://github.com/szjack/rsyslog into master-candidate 2016-01-14 10:14:00 -05:30
Rainer Gerhards
b6706218fc Merge branch 'master' of https://github.com/vanpire110/rsyslog into master-candidate 2016-01-14 10:12:41 -05:30
Rainer Gerhards
07a074dd88 cleanup: remove dbgprintf's not intended to stay
those starting at column 0 are temporary debug aids during development.
Some of them I intend to keep in for a version or two. Some of them
I tend to forget later. This is a cleanup of those. Most are removed,
some are promoted to be permanently there - now indicated by proper
indention.
2016-01-13 09:20:07 -05:30
Rainer Gerhards
b8b796c965 fix comments
C++ comments do not work on all platforms

fixed most, but left some due to running out of time
2016-01-13 06:16:36 -05:30
Rainer Gerhards
2e55c77d70 clean up doAction output module interface
We started with char * pointers, but used different types of pointers
over time. This lead to alignment warnings. In practice, I think this
should never cause any problems (at least there have been no reports
in the 7 or so years we do this), but it is not clean. The interface is
now cleaned up. We do this in a way that does not require modifications
to modules that just use string parameters. For those with message
parameters, have a look at e.g. mmutf8fix to see how easy the
required change is.
2016-01-13 04:04:26 -05:30
Rainer Gerhards
6d9a8c0f01 mmgrok: build with any json-c compatible library 2016-01-12 16:47:54 +01:00
Peter Portante
2470f0f72b Remove use of sizeof(char) and sizeof(uchar)
Remove the use sizeof(char) or sizeof(uchar) in calculations for memory
allocation or string length.  There are no known platforms for which
sizeof(char) or sizeof(uchar) is not 1, and c99 has defined sizeof(char)
to be 1 (section 6.5.3.4 of c99).
2015-12-16 02:18:45 +00:00
Peter Portante
cfe67608ee Add missing libgrok1; break up make commands 2015-12-09 19:27:34 +00:00
Peter Portante
a685441fba Clean up duplicate line commented out 2015-12-09 12:17:36 +00:00
Rainer Gerhards
3e583bc785 travis/mmgrok: yet another try at getting it to build
The previous commit build, but make distcheck failed.

Note that I also tried various things locally like changing library
position in the option line and adding -L at other places. None
works.
2015-12-08 16:49:04 +01:00
Rainer Gerhards
356baec285 mmgrok: make link succeed on Ubuntu 14.04
note that this is not a good solution, but right now I don't know
how to fix this better. At least it enables travis to run.
2015-12-08 11:05:24 +01:00
Rainer Gerhards
9834fe5836 mmgrok: remove unused variable 2015-12-08 10:05:52 +01:00
Rainer Gerhards
601375fe65 mmgrok: fix too-large malloc 2015-12-08 10:05:27 +01:00
Peter Portante
fd591751f5 Derive glib-2.0 build flags for mmgrok at config
Instead of requiring the user to set the proper CFLAGS before invoking
./configure, we add CFLAGS and LIBS values as determined by pkg-config
during configuration setup.

We also update the requirements to be glib-2.0 instead of just plain
glib.
2015-12-07 22:21:28 +00:00
Rainer Gerhards
e5f5383117 Merge branch 'master' of https://github.com/c6226/rsyslog into master-candidate
Conflicts:
	contrib/omhttpfs/omhttpfs.c
2015-12-07 11:59:26 +01:00
Jeremy Qian
b14b930825 fix memory leak
Signed-off-by: Jeremy Qian <vanpire110@163.com>
2015-12-07 17:06:24 +08:00
Rainer Gerhards
b954652df5 omhttpfs: we cannot use printf in a module
stdout is closed, so the write goes to some random file
2015-12-07 09:56:44 +01:00
Rainer Gerhards
6af2fbf738 Merge branch 'master' of https://github.com/haixingood/rsyslog into travis-omhttpfs 2015-12-07 09:54:46 +01:00
Rainer Gerhards
087ecb691e omhttpfs: make build with older json-c
this is not the most optimal way to achive the result; anybody
feel free to improve this code and send a PR

also fix some incorrect code
2015-12-07 09:45:16 +01:00
jack
9f9cff992e modify process of free memory 2015-12-07 15:48:21 +08:00