summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-2310-2105/+185
|\ | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c
| * imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
| |
| * refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-239-2063/+176
| | | | | | | | | | | | | | The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver.
* | cosmetic: remove compiler warningsRainer Gerhards2012-01-194-5/+4
| |
* | refactor: removing dead apc codeRainer Gerhards2012-01-196-466/+0
| | | | | | | | | | | | another concept that did not prove valuable enough to be kept active. For the last couple of releases, the dead code was kept inside the project as we thought we could probably reuse it. Doesn't look so...
* | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-196-114/+8
| | | | | | | | This was a bad idea that never was used much.
* | omshell: light cleanupRainer Gerhards2012-01-191-11/+7
| |
* | cleanup: different text escape types made more portableRainer Gerhards2012-01-192-15/+5
| |
* | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-192-140/+12
| |
* | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-1920-97/+39
| |
* | Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
| * | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | | | | | to make using pre-v6-plugins even easier
* | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-1938-308/+308
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 II (now finished)Rainer Gerhards2012-01-1915-65/+65
| | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
| * | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1825-235/+235
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1870-1055/+954
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1444-671/+659
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
* | \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-1818-160/+590
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
| |\ \ \ \
| | * | | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| | | | | |
| | * | | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| | | | | |
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-1710-56/+404
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| | * | | | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | email conversation Nathan/Rainer 2012-01-16&17
| | * | | | | | add elasticsearch output moduleNathan Scott2012-01-175-0/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | | 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
| | | | | | | | | | | |
generated by cgit (git 2.34.1) at 2024-05-11 20:47:50 +0000