summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-274-24/+20
| | | | and legacy configuration mode is used
* Merge branch 'v6-stable'Rainer Gerhards2012-01-276-47/+62
|\ | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| | * added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| | |
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| | |\
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-273-0/+9
| | | | | | | | | | | | | | | | configured
| | | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
| | | * licensing changeRainer Gerhards2012-01-212-31/+29
| | | |
| * | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | | |
* | | | omprog: added support for v6 config systemRainer Gerhards2012-01-272-1/+67
| | | |
* | | | cleanup: remove omdbalertingRainer Gerhards2012-01-274-174/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | someone claimed to write a module with this functionality, if a template were provided. And indeed, it was provided but never anything happend (at least nothing was contributed back...). Removing this silly template now. If someone really intends to take up on it, get a copy from older git versions.
* | | | ompipe: cosmetic, rename varRainer Gerhards2012-01-271-12/+12
| | | |
* | | | ompipe: support for v6 config system addedRainer Gerhards2012-01-272-9/+63
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2012-01-273-10/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | preparing for 5.9.6v5.9.5Rainer Gerhards2012-01-272-8/+4
| | | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-273-3/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-272-4/+5
| | | | | |
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-244-3/+9
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: configure.ac
| | | * | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | | | | |
| | | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | thanks to Tomas Heinrich for alerting me.
* | | | | | 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>
generated by cgit (git 2.34.1) at 2024-06-30 14:02:54 +0000