summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-0/+3
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * 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' 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-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 '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
| | | |
* | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
* | | | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| | | |
* | | | 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-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
* | | | | cosmetic: removing commented-out testing aidRainer Gerhards2011-02-251-1/+0
| | | | |
* | | | | bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| | | | |
* | | | | cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-161-3/+2
| | | | |
* | | | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-1/+1
| | | | |
* | | | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
* | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-3/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| * | | | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| * | | | cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-2/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: runtime/parser.c
| | * | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-2/+0
| | | | |
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-171-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | | |
| * | | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
* | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supportedRainer Gerhards2010-12-021-7/+7
| | | | | | | | | | | | | | | | | | | | also cleaned up some minor things
* | | | | minor: improved error message when already runningRainer Gerhards2010-09-171-4/+3
| | | | |
* | | | | Merge branch 'systemd' into v5-develRainer Gerhards2010-09-081-29/+32
|\ \ \ \ \
| * | | | | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-071-29/+32
| | | | | |
* | | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-111-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | | | added imptcpRainer Gerhards2010-08-101-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
| | * | | temporary bugfix replaced by permanent one for...Rainer Gerhards2010-03-311-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | ...message-induced off-by-one error (potential segfault) (see 4.6.2) The analysis has been completed and a better fix been crafted and integrated.
* | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-051-0/+3
| |_|/ |/| |
* | | milestone(BUGGY): batch now pushed down to actionRainer Gerhards2010-06-151-12/+1
| | | | | | | | | | | | | | | | | | | | | at least in important cases (not for non-direct action queues and some other minor things). This version is definitely buggy, but may be tried with success on a non-production system. I will continue to work on the correctness, but needed to commit now to get a baseline.
* | | milestone commit(BUGGY): batch is now handed down to rule processingRainer Gerhards2010-06-101-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | Now, the full batch is passed down to the rule, which then enqueues the elements as single messages. Note that this code has some known defects and needs more changes until it is correct again. This is primarily a commit to be able to return to a known-(somewhat)-good state.
* | | main msg q consumer now preprocesses messages before doing rule processingRainer Gerhards2010-06-091-25/+47
| | | | | | | | | | | | | | | | | | | | | things like ACL check and message parsing. This leads to a greater level of concurrent processing. Beware, though, that this commit duplicates some messages. May be a regression from this or an earlier commit. I will soon sort out.
* | | somewhat improved direct mode queue performanceRainer Gerhards2010-06-091-1/+1
| | | | | | | | | | | | | | | ... but only for batch enqueues. This will not help much with the current code, but will play well with upcoming changes.
* | | finshed implementation of strgen modulesRainer Gerhards2010-06-041-9/+11
| | | | | | | | | | | | | | | | | | and also provided four build-in modules for the most common use cases, hopefully resulting in a speedup of around 5% for typical rsyslog processing.
* | | first implementation of strgen interfaceRainer Gerhards2010-06-011-0/+4
| | | | | | | | | | | | | | | and a first built-in strgen module. Some tweaks and more default strgens are needed, but the code doesn't look too bad ;)
* | | some more cleanup and a nasty little bug i doDie()Rainer Gerhards2010-05-101-13/+0
| | |
* | | Merge branch 'v4-devel' into tmpRainer Gerhards2010-04-261-0/+20
|\| |
generated by cgit (git 2.34.1) at 2025-09-04 15:26:13 +0000