rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-22 23:30:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,182 Commits 67 Branches 505 Tags
Commit Graph

593 Commits

Author SHA1 Message Date
Rainer Gerhards
0b8f3d5463 Merge branch 'v5-stable-newstats' into v5-devel 2012-04-12 14:10:36 +02:00
Rainer Gerhards
e4d87aac95 Merge branch 'v5-stable' into v5-stable-newstats 
Conflicts:
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
 2012-04-12 14:10:09 +02:00
Rainer Gerhards
d749dadcc3 imuxsock: do not cache hostname 2012-04-12 10:14:32 +02:00
Marius Tomaschewski
a3a0acadb4 Allocate LocalDomain as new string 
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>
 2012-04-11 14:53:09 +02:00
Rainer Gerhards
d0a73d3449 bugfix: hostname was not requeried on HUP 
Thanks to Marius Tomaschewski for reporting this bug.
 2012-04-11 11:18:41 +02:00
Rainer Gerhards
d53016962d Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	configure.ac
	doc/manual.html
 2012-04-07 14:44:12 +02:00
Rainer Gerhards
bfc6f6d599 Merge branch 'v5-stable' into v5-stable-newstats 
Conflicts:
	configure.ac
 2012-04-07 14:33:37 +02:00
Rainer Gerhards
49ec54d369 milestone: added capability to use a local interface IP address as fromhost-ip 
... for locally originating messages. New directive $LocalHostIPIF.
Note that not all modules yet support this new directive - next step...
 2012-03-21 11:43:45 +01:00
Kaiwang Chen
f62031df11 added tool to recover disk queue if .qi file is missing (recover_qi.pl) 2012-03-15 10:58:40 +01:00
Rainer Gerhards
2c7604f45b cosmetic: removed stray definition 2012-03-12 17:01:44 +01:00
Rainer Gerhards
f90675f33f Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/imuxsock.html
	doc/manual.html
	runtime/queue.c
 2012-03-12 17:00:21 +01:00
Rainer Gerhards
9601b181cf added capability to use a local interface IP address as fromhost-ip for imuxsock 
new config directives: $IMUXSockLocalIPIF
 2012-03-06 17:26:04 +01:00
Rainer Gerhards
5c09faee34 queue: lightdelay config: keep default of 70% until mark is explicitely set 2012-02-22 09:43:25 +01:00
Rainer Gerhards
f9b6b94b80 added configuration directives to customize queue light delay marks 
$MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both
specify number of messages starting at which a delay happens.
 2012-02-21 16:52:36 +01:00
Rainer Gerhards
37e4aab1ec Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c
 2012-01-17 10:48:39 +01:00
Nathan Scott
f8019d52f8 add elasticsearch output module 
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>
 2012-01-17 10:31:37 +01:00
Peng Haitao
167192666b fix error of not define HAVE_SETSID 
[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>
 2012-01-16 17:12:57 +01:00
Rainer Gerhards
abb381b8a5 Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	plugins/imtcp/imtcp.c
 2012-01-16 17:04:10 +01:00
Rainer Gerhards
2f2169c5c2 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	tools/syslogd.c
 2012-01-16 16:57:46 +01:00
Tomas Heinrich
209a6d8e15 FQDN hostname for multihomed host was not always set to the correct name 
..if multiple aliases existed. Thanks to Tomas Heinreich for the patch.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2012-01-16 16:53:18 +01:00
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
 2012-01-14 18:32:40 +01:00
Rainer Gerhards
d5a18a93ae omfwd refactor: even more simplification (small one ;)) 2012-01-14 18:29:33 +01:00
Rainer Gerhards
38afe62f33 omfwd license change to ASL 2.0 
after careful consideration of contributor history. David Lang gave
permission to license under ASL 2.0, other patches have been replaced
by refactored code.
 2012-01-14 18:25:23 +01:00
Rainer Gerhards
ac64c118ea omfwd refactor: simplification 
at the same time, remove commits
- 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127
- 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
 2012-01-14 18:22:16 +01:00
Rainer Gerhards
45ba66d14a omfwd refactor: simplifying code 
also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
 2012-01-14 18:13:26 +01:00
Rainer Gerhards
e335a65788 more license analysis & change 2012-01-14 18:01:12 +01:00
Jim Hill
d850639d9b rsyslog.conf.5 socket module example sb imuxsock 2012-01-14 16:57:10 +01:00
Rainer Gerhards
0216053099 relicense parts under ASL 2.0 
after carful check for copyright holder
 2012-01-11 18:30:33 +01:00
Rainer Gerhards
d0a83a1f7a Merge branch 'v4-stable-tmp' into v5-devel-tmp 
Conflicts:
	dirty.h
	tools/syslogd.c
 2012-01-10 18:04:01 +01:00
Rainer Gerhards
545a80918b Merge branch 'tmp' into v4-stable-tmp 
Conflicts:
	dirty.h
	doc/rsyslog_conf_global.html
	tools/syslogd.c
 2012-01-10 17:18:11 +01:00
Tomas Heinrich
a2e69cffff added $SpaceLFOnReceive config directive 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2012-01-10 17:14:16 +01:00
Rainer Gerhards
159abfbc37 Merge branch 'tmp' into v4-stable-tmp 2012-01-10 17:08:47 +01:00
Tomas Heinrich
e25dc05e91 added canned template for ultra-exact sysklogd file format 
the point is that LF will be translated to SP

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2012-01-10 17:07:55 +01:00
Rainer Gerhards
12102199c4 Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
 2011-10-21 14:42:32 +02:00
Rainer Gerhards
ce315e5da3 minor: slightly improved error reporting when dynafile open fails 2011-10-20 14:26:51 +02:00
Rainer Gerhards
0c7604dc27 Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
	tools/omfile.c
	tools/ompipe.c
 2011-09-26 11:58:20 +02:00
Rainer Gerhards
b26387e6b2 bugfix: omfile returns fatal error code for things that go really wrong 
previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.
 2011-09-26 11:36:44 +02:00
Rainer Gerhards
6d3cc9e406 Merge branch 'v4-stable' into v5-stable 
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
 2011-09-22 12:20:27 +02:00
Rainer Gerhards
086db18cc3 bugfix: potential abort if ultra-large file io buffers are used and 
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
 2011-09-20 15:16:53 +02:00
Rainer Gerhards
1d0e4ba3b3 Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable 2011-09-15 15:17:47 +02:00
Andrew Stothard
b7e69a2400 typo fix 2011-09-15 15:17:09 +02:00
Rainer Gerhards
b1e21fcb4b Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
 2011-09-07 15:19:18 +02:00
mono_matsuko
fb7fab511e bugfix: rsyslogd -v always said 64 atomics were not present 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-09-05 12:18:11 +02:00
Rainer Gerhards
a34d37a9e3 Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
 2011-08-30 15:40:20 +02:00
Rainer Gerhards
645a8541d5 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	ChangeLog
	tools/syslogd.c
 2011-08-30 15:35:02 +02:00
Rainer Gerhards
581daa5418 Merge branch 'v4-stable' into v4-beta 
Conflicts:
	ChangeLog
 2011-08-30 14:53:31 +02:00
Andre Lorbach
803462104b Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	configure.ac
 2011-08-16 11:01:41 +02:00
Andre Lorbach
1697917525 Added debug output into message parsers needed for bugtracking 
Changed version to 5.8.5-pre1
 2011-08-12 14:48:43 +02:00
Rainer Gerhards
1ca6cc236d bugfix: off-by-one(two) bug in legacy syslog parser 2011-08-10 11:41:03 +02:00
Rainer Gerhards
d6b6b30c18 added capability to emit config error location info for warnings 
otherwise, omusrmsg's warning about new config format was not
accompanied by problem location.
 2011-08-09 11:48:52 +02:00