summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-2/+2
|\
| * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-2/+2
| |\ | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
| | |
* | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-291-0/+3
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-291-0/+3
| |\|
| | * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-1/+1
| | |
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-0/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | |
* | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
| | |
* | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-031-1/+1
| | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* | | cleanup: removed unused but set parametersRainer Gerhards2012-04-232-4/+2
| | |
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-72/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-73/+97
| |\ \
| | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-73/+97
| | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-1/+1
| | | |
| | | * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-72/+93
| | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-073-9/+211
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
* | \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-8/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+209
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: configure.ac
| * | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-9/+2
| | |_|/ | |/| | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-0/+1
| | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-221-3/+5
| | | |
| * | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-2/+6
| | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-172-1/+209
|\ \ \ \
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-172-1/+209
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-152-1/+209
| | |/ /
* | | | ompipe: cosmetic, rename varRainer Gerhards2012-01-271-12/+12
| | | |
* | | | ompipe: support for v6 config system addedRainer Gerhards2012-01-272-9/+63
| | | |
* | | | cosmetic: remove compiler warningsRainer Gerhards2012-01-192-3/+2
| | | |
* | | | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-191-2/+2
| | | | | | | | | | | | | | | | This was a bad idea that never was used much.
* | | | omshell: light cleanupRainer Gerhards2012-01-191-11/+7
| | | |
* | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-196-25/+10
| | | |
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-192-27/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-183-75/+75
| | | | | | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-1/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1413-194/+178
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-09-263-10/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | \ \ \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-182-46/+35
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | 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-1614-195/+199
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | | | | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
| | | | | | |
| * | | | | | omfwd license change to ASL 2.0Rainer Gerhards2012-01-141-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after careful consideration of contributor history. David Lang gave permission to license under ASL 2.0, other patches have been replaced by refactored code.
| * | | | | | omfwd refactor: simplificationRainer Gerhards2012-01-141-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the same time, remove commits - 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127 - 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
generated by cgit (git 2.34.1) at 2024-05-01 02:38:26 +0000