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

1143 Commits

Author SHA1 Message Date
Rainer Gerhards
5a16a2a3d9 Merge branch 'v7-stable' into v8-stable 2014-10-06 14:49:17 +02:00
Rainer Gerhards
1ea89f227a remove zpipe (a testing tool) from --enable-diagtools 
This tool is no longer maintained and currently not used inside the
testbench. We keep it in the source tree for the time being in case that
it may be used in the future.
 2014-10-06 14:49:00 +02:00
Rainer Gerhards
3d2dcb5623 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
	configure.ac
 2014-10-06 10:50:30 +02:00
Rainer Gerhards
4f1ef74ef7 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
 2014-10-06 10:46:46 +02:00
Rainer Gerhards
934dab0ed9 rsgtutil: avoid emitting unnecessary error messages 2014-10-06 10:44:28 +02:00
Rainer Gerhards
61a25cc2a8 bugfix: rsgtutil sometimes crashed in verify mode if file did not exist 2014-10-06 10:41:19 +02:00
Rainer Gerhards
c374cce103 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
 2014-10-02 08:13:49 +02:00
Rainer Gerhards
3755b21992 do not try to parse messages with invalid facility (RFC3164 mode) 2014-10-01 11:41:09 +02:00
Rainer Gerhards
b9427fa9a2 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
	configure.ac
 2014-09-30 12:14:36 +02:00
Chris Hiszpanski
20d869968b Added LIBLOGGING_STDLOG_CFLAGS and LIBLOGGING_STDLOG_LIBS to automake sources 
Build was failing when using these variables
 2014-09-25 05:06:57 -07:00
Rainer Gerhards
b11bf2745c Merge branch 'v7-stable-prifix' into v8-stable-prifix 
WARNING: does not compile, will be fixed with next commit

Conflicts:
	configure.ac
	tools/rsyslogd.c
 2014-09-16 14:59:14 +02:00
Rainer Gerhards
1ac20ffe97 Merge branch 'v5-stable-prifix' into v7-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imtemplate/imtemplate.c
	plugins/imuxsock/imuxsock.c
	runtime/msg.c
	runtime/rsyslog.h
	runtime/rule.c
	runtime/syslogd-types.h
	tools/syslogd.c
 2014-09-16 14:48:29 +02:00
Rainer Gerhards
df4e90f602 Merge branch 'v5.8.13-prifix' into v5-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/ksym.c
	runtime/rule.c
 2014-09-16 12:43:29 +02:00
Rainer Gerhards
2a9f4e6030 Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 
Conflicts:
	plugins/imklog/imklog.c
 2014-09-16 12:11:09 +02:00
Rainer Gerhards
20a8056ac7 fix compile problems and cleanup 
most importantly, we do no longer use the LOG_FAC() and LOG_PRI() macro
names, which may conflict with systems names and may act other than
expected by a user.
 2014-09-16 11:46:41 +02:00
Rainer Gerhards
6c6186d92c Merge pull request #93 from deymo/tot-imuxsock-shrink 
plugins: Remove $(RSRT_LIBS) from imuxsock's LIBADD
 2014-08-20 11:41:30 +02:00
Rainer Gerhards
b13dad0df7 Merge branch 'v8-stable' 2014-07-15 12:36:28 +02:00
Rainer Gerhards
9605156fa0 Merge branch 'v7-stable' into v8-stable 2014-07-15 12:36:20 +02:00
Rainer Gerhards
51f5693b50 fix compiler warnings on some platforms 2014-07-15 12:35:57 +02:00
Rainer Gerhards
8ce0927fea Merge branch 'v8-stable' 2014-07-15 11:15:30 +02:00
Rainer Gerhards
8cc88863e2 Merge branch 'v7-stable' into v8-stable 2014-07-15 11:15:17 +02:00
Rainer Gerhards
058c3864d5 bugfix: make dist failed when GUARDTIME or LIBGCRYPT feature was disabled 2014-07-15 11:15:00 +02:00
Rainer Gerhards
bae2cf3cce Merge branch 'v8-stable' 2014-07-14 11:39:27 +02:00
Rainer Gerhards
a45ea8a144 testbench: make more reliable shutdown 
so far, we checked only the main queue size to become zero, ignoring
the sizes of action queues. For some tests, this caused racieness and
unreliability. Now, we check all queues. This should make matters
much more stable.
 2014-07-11 17:23:21 +02:00
Rainer Gerhards
ff2ec4001f Merge branch 'v8-stable-newparsers' 2014-07-08 16:17:15 +02:00
Rainer Gerhards
4da700873e pmciscoiso: support Nexus TZ string in date (but right now ignore it) 
This does not longer give a parsing error, however, no information is right
now obtained from that TZ string.
 2014-07-08 15:51:52 +02:00
Rainer Gerhards
8d2f5bc657 Merge branch 'v8-stable' 2014-07-01 09:28:45 +02:00
Rainer Gerhards
6f0f71001d Merge branch 'v7-stable' into v8-stable 2014-06-21 06:49:23 +02:00
Michael Biebl
b1cbb1b1f4 regression fix: invalid pidfile location 
closes: https://github.com/rsyslog/rsyslog/issues/86
 2014-06-21 06:48:33 +02:00
Alex Deymo
ef18451ff5 plugins: Remove $(RSRT_LIBS) from imuxsock's LIBADD 
imuxsock.c plugin uses some functions from sd-daemon.h that are
compiled as part of librsyslog.a. Including $(RSRT_LIB) to the LIBADD
variable on these plugins means that we are linking librsyslog.a
statically into that plugin. Nevertheless, the rsyslogd binary
already includes most of the librsyslog.a and exposes its symbols.
Because of this, we can let those functions undefined in the plugin
.so file and let dlopen() link those undefined functions against the
global symbols from rsyslogd.

This patch removes the static library from imuxsock.so and ensures
that all the objects from the librsyslog.a are included on rsyslogd.
 2014-06-17 19:57:21 -07:00
Rainer Gerhards
c62acb81af Merge branch 'v8-stable' 2014-06-04 15:35:55 +02:00
Rainer Gerhards
de74860c17 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/syslogd.c
 2014-06-04 15:35:46 +02:00
Rainer Gerhards
4f936073cc place some more code under ASL 2.0 
Note:

* Yann Droneaud contribution to this code has been removed
  with this commit
* mono_matsuko contribution was already removed by previous
  commits

The rest was my own code.
 2014-06-04 15:28:51 +02:00
Rainer Gerhards
6757ec6dd4 make rsyslogd -v output work in regard to 64 bit atomic buildin info 2014-06-04 15:25:29 +02:00
Rainer Gerhards
48125c7ce2 remove contribution from mono_matsuko 
we could not reach him to agree to the re-licensing to ASL 2.0.
So I remove his contribution, which means we do no longer need
has agreement. This was the original contribution:

http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=fb7fab511e0de2566c0de47468b443ef5bb508d3

Note that the bug is now introduced again. We will fix it via a
different method in the next commit.
 2014-06-04 15:18:50 +02:00
Rainer Gerhards
d20e7425dc Merge branch 'v8-stable' 2014-05-28 14:29:41 +02:00
Rainer Gerhards
46a92c5e8e Merge branch 'v7-stable' into v8-stable 2014-05-28 14:29:32 +02:00
Rainer Gerhards
26a4aee296 fix regression in config validation run 
bug was in no released version
 2014-05-28 14:05:44 +02:00
Rainer Gerhards
17710e47da better diagnostic message 2014-05-28 13:06:37 +02:00
Rainer Gerhards
68307718c1 Merge branch 'v8-stable' 2014-05-28 12:13:40 +02:00
Rainer Gerhards
93cf514504 Merge branch 'v7-stable' into v8-stable 2014-05-28 12:13:27 +02:00
Rainer Gerhards
f20537627f Merge remote-tracking branch 'github/v7-stable' into v7-stable 2014-05-28 12:00:09 +02:00
Rainer Gerhards
78bc3a706b fix build problem on debian 2014-05-28 11:59:03 +02:00
Rainer Gerhards
da2dac0385 cleanup 2014-05-27 15:56:23 +02:00
Rainer Gerhards
528d86f8fc Merge branch 'v8-stable' 
Conflicts:
	tools/syslogd.c
 2014-05-27 15:51:30 +02:00
Rainer Gerhards
cef5a3a7d1 Merge branch 'v7-stable' into v8-stable 2014-05-27 15:42:45 +02:00
Rainer Gerhards
3cab204a3f relicense 
ok from copyright holders: me, Red Hat, Canonical
 2014-05-27 15:41:30 +02:00
Rainer Gerhards
831d6199e4 Merge branch 'v8-stable' 2014-05-27 13:10:48 +02:00
Rainer Gerhards
0c60fc158d Merge branch 'v7-stable' into v8-stable 2014-05-27 13:10:37 +02:00
Rainer Gerhards
89b387c7a5 relicense auxiluary file 
it's not even a real rsyslog part...
I am the sole author.
 2014-05-27 13:03:47 +02:00