summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | add elasticsearch output moduleNathan Scott2012-01-171-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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>
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-161-1/+21
| |\| | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+3
| | |\| |
| | | * | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-1/+21
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-1/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * | | FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-2/+22
| | |/ / | | | | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-1/+2
| | | | |
* | | | | removed compatibility mode as we expect people have adjusted their confs by nowRainer Gerhards2011-07-121-234/+13
| | | | |
* | | | | removed emergency config, do error reporting on fatal config file errorRainer Gerhards2011-07-121-1/+1
| | | | |
* | | | | cleanup, removing now unused codeRainer Gerhards2011-07-111-5/+0
| | | | |
* | | | | milestone/[PARTWORK]: implemented comparison operationsRainer Gerhards2011-07-081-1/+0
| | | | |
* | | | | milestone:/[PARTWORK]: config is processed using new parser, except...Rainer Gerhards2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;))
* | | | | Merge branch 'beta'Rainer Gerhards2011-06-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| | * | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-091-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
| | * | | | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| | | | | |
* | | | | | added a first implementation of a DNS name cacheRainer Gerhards2011-06-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this still has a couple of weaknesses, like no size limit, no expiration of entries, suboptimal algorithms -- but it should perform better than what we had previously. Implementation will be improved based on feedback during the next couple of releases
* | | | | | regression fix: config validation code affected by recent changesRainer Gerhards2011-05-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | did not return with proper return value
* | | | | | step: moved main message queue activation to after priv dropRainer Gerhards2011-04-271-12/+1
| | | | | |
* | | | | | step: config-specific module list used during config processingRainer Gerhards2011-04-271-1/+1
| | | | | |
* | | | | | step: shuffled module-related code from syslogd.c to rsconf.cRainer Gerhards2011-04-271-217/+52
| | | | | | | | | | | | | | | | | | | | | | | | ... plus some minor cleanup/code shuffle
* | | | | | step: outchannel list integrated into main config objectRainer Gerhards2011-04-261-41/+20
| | | | | |
* | | | | | step: moved config validation codeRainer Gerhards2011-04-261-20/+0
| | | | | |
* | | | | | shuffled even more config code from syslgod to config handlerRainer Gerhards2011-04-261-166/+1
| | | | | |
* | | | | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-211-351/+41
| | | | | |
* | | | | | step: begun to create a "load" interface in rsconfRainer Gerhards2011-04-211-19/+23
| | | | | |
* | | | | | step: slowly migrating config settings... ;)Rainer Gerhards2011-04-191-54/+25
| | | | | |
* | | | | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-1/+1
| | | | | |
* | | | | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-11/+11
| | | | | |
* | | | | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-13/+51
| | | | | |
* | | | | | milestone: templates are now in config objectRainer Gerhards2011-04-191-14/+24
| | | | | |
* | | | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | | | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-191-1/+1
|/ / / / /
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-161-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
| | | | | |
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
| | * | | | bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-251-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 02:53:13 +0000