summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| * | | | | | omfwd refactor: simplifying codeRainer Gerhards2012-01-141-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
| * | | | | | 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-1814-195/+199
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 v5-stableRainer Gerhards2012-01-1413-194/+178
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * | | | | | more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | | | | | | |
| | * | | | | | rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | | | | | | |
| | * | | | | | relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | after carful check for copyright holder
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-211-2/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | | |_|_|/ | | |/| | |
* | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-112-73/+232
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-263-13/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-10/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
| | * | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-222-6/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| | | * | | Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-153-31/+98
| | | |\ \ \
| | | | * \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+9
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | | | | | | |
| | | | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-112-2/+12
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-301-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
| * | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-301-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | / / / / / | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| | | * | | | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | | |_|_|_|/ / | | | |/| | | | |
* | | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-181-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| * | | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* | | | | | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
| | | | | | | | |
generated by cgit (git 2.34.1) at 2024-09-24 01:22:21 +0000