| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
| |
This was a bad idea that never was used much.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/imklog.c
plugins/immark/immark.c
plugins/imptcp/imptcp.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/imtemplate/imtemplate.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
plugins/mmsnmptrapd/mmsnmptrapd.c
plugins/omtemplate/omtemplate.c
runtime/glbl.c
runtime/parser.c
tools/omfile.c
tools/syslogd.c
|
| |
| |
| |
| | |
The most common files are now changed, more needs to be done.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
plugins/imtcp/imtcp.c
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/parser.c
template.c
tools/omfwd.c
tools/syslogd.c
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
|
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add support for sending events to elasticsearch - a distributed,
RESTful, search engine built on Lucene (www.elasticsearch.org).
The output module is enabled via a configure option, and uses
libcurl to send the messages from rsyslog to elasticsearch.
This patch makes use of the earlier JSON quoting patch to ensure
valid JSON strings are sent to the server.
Signed-off-by: Nathan Scott <nathans@aconex.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
[add list to the CC list]
When HAVE_SETSID is not defined, rsyslogd will use ioctl() make itself to daemon,
but this can not make rsyslogd process become the process group leader of a new
process group. In RHEL6.1, the status is as follows:
# uname -a
Linux RHEL6U1GA-Intel64-199 2.6.32-131.0.15.el6.x86_64 #1 SMP Tue May 10 15:42:40 EDT 2011 x86_64 x86_64 x86_64 GNU/Linux
# /etc/init.d/rsyslog restart
Shutting down system logger: [ OK ]
Starting system logger: [ OK ]
# ps axo pgrp,ppid,pid,comm | grep rsyslog
6290 1 6301 rsyslogd
When we send SIGTERM signal to 6290, rsyslogd will die:( So I think we should
call setpgid() before ioctl().
Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
|
| |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
plugins/imtcp/imtcp.c
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
after careful consideration of contributor history. David Lang gave
permission to license under ASL 2.0, other patches have been replaced
by refactored code.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
at the same time, remove commits
- 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127
- 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
dirty.h
tools/syslogd.c
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
| | |\| | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
the point is that LF will be translated to SP
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
|\ \ \ \ \ \ \ \ \
| | |_|_|/ / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
ChangeLog
action.h
configure.ac
doc/manual.html
plugins/immark/immark.c
plugins/impstats/impstats.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
runtime/cfsysline.c
runtime/cfsysline.h
runtime/conf.c
runtime/ctok.c
runtime/ctok.h
runtime/ctok_token.c
runtime/ctok_token.h
runtime/dnscache.h
runtime/expr.c
runtime/expr.h
runtime/rule.c
runtime/rule.h
runtime/ruleset.h
runtime/sysvar.c
runtime/vm.h
runtime/vmop.c
runtime/vmop.h
runtime/vmprg.c
runtime/vmprg.h
runtime/vmstk.c
runtime/vmstk.h
tools/omusrmsg.c
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
tools/syslogd.c
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
..if multiple aliases existed. Thanks to Tomas Heinreich for the patch.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
| |\| | | | | | |
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
after carful check for copyright holder
|
|\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
|
| |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
|
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
|
|\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/conf.c
tools/omfile.c
tools/omusrmsg.c
|
| |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
tools/omfile.c
tools/ompipe.c
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.
|
| | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/parser.c
runtime/rsyslog.h
tests/Makefile.am
tests/tcpflood.c
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
|
| | | |\ \ \ |
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
ChangeLog
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
ChangeLog
|
| | | | | | | | | |
|
| | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| |\| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|