summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | add JSON escaping optionNathan Scott2012-01-173-38/+63
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com>
| * | | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-163-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-)
| * | | | | | | 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-16113-1708/+1594
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| | * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| | * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-092-5/+7
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
| | | | | | | | | | |
| * | | | | | | | | | cosmetic: cleanup of ChangeLogRainer Gerhards2012-01-141-2/+0
| | | | | | | | | | |
| * | | | | | | | | | 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 'v5-devel' into v5-devel-tmpRainer Gerhards2012-01-121-4/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | probably caused by a recent merge, was not present in 5.9.4
| * | | | | | | | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-104-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * | | | | | | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-104-1/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | | | | | | | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-104-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | | | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-102-0/+7
| | |\| | | | | | | | | |
| | | * | | | | | | | | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-092-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge v5-stable-newstats & manual ChangeLog updateRainer Gerhards2012-01-091-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-091-94/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | | | | | | | | push version numberRainer Gerhards2012-01-091-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
| | | | | | | | | | | | |
| | * | | | | | | | | | | imudp refactor: field renaming (new names more more sense)Rainer Gerhards2012-01-091-20/+19
| | | | | | | | | | | | |
| | * | | | | | | | | | | imudp refactor: regression fixRainer Gerhards2012-01-091-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | imudp refactor: fixed socket leakRainer Gerhards2012-01-091-9/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
| | | | | | | | | | | | |
| | * | | | | | | | | | | prepared milestone (version push)Rainer Gerhards2011-12-211-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-18100-1502/+1418
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | licensing updateRainer Gerhards2012-01-161-17/+16
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | Conflicts: tools/syslogd.c
| | * | | | | | | | FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..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-1665-1001/+882
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * | | | | | | | license changesRainer Gerhards2012-01-1645-704/+617
| | | | | | | | | |
| | * | | | | | | | runtime license changeRainer Gerhards2012-01-1620-297/+265
| | | | | | | | | |
| * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after careful consideration of affected code
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | |
| | * | | | | | | more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | | | | | | | |
| | * | | | | | | some more files to ASL 2.0Rainer Gerhards2012-01-117-108/+104
| | | | | | | | |
| | * | | | | | | relicense parts under ASL 2.0Rainer Gerhards2012-01-1120-294/+316
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | after carful check for copyright holder
| * | | | | | | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| | |_|_|/ / / | |/| | | | |
* | | | | | | finally cleaning up the syslog-ng rsyslog comparisonRainer Gerhards2012-01-091-112/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this page should be removed from the doc set over time -- it really does not belong here.
* | | | | | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-097-770/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 18:33:11 +0000