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

1041 Commits

Author SHA1 Message Date
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
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
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
Rainer Gerhards
adab30bc64 cleanup 2014-05-27 12:55:41 +02:00
Rainer Gerhards
1831850f34 relicensing 
only Adiscon authors
 2014-05-27 12:53:09 +02:00
Rainer Gerhards
8551e29d51 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/syslogd.c
 2014-05-27 12:46:28 +02:00
Rainer Gerhards
c28fcc35ed cleanup 2014-05-27 12:35:19 +02:00
Rainer Gerhards
5b1795aa15 relicense 
own code + contribs from Red Hat, for which permision
to relicense exists (email 2014-05-27).
 2014-05-27 12:28:40 +02:00
Rainer Gerhards
35457fbdc6 cleanup 2014-05-27 12:26:05 +02:00
Rainer Gerhards
fabed7328c relicense some of my own code under ASL 2.0 2014-05-27 12:19:27 +02:00
Rainer Gerhards
48a5079cb7 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/syslogd.c
 2014-05-27 12:02:40 +02:00
Rainer Gerhards
52aae5928f refactor shutdown 
also relicensing some of my own code under ASL 2.0
 2014-05-27 11:58:56 +02:00
Rainer Gerhards
7ef891db8e relicense some of my own code under ASL 2.0 2014-05-27 11:39:00 +02:00
Rainer Gerhards
1cc0f1b354 relicensing: flag some contributions in source code 
so that we can easier follow where we still need to get
permissions for the relicense
 2014-05-27 11:24:10 +02:00
Rainer Gerhards
8c6e400b76 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/syslogd.c
 2014-05-26 18:50:10 +02:00
Rainer Gerhards
6e86158724 cleanup: remove no longer used code 2014-05-26 15:55:19 +02:00
Rainer Gerhards
fe9768a766 cleanup, new interfaces 2014-05-26 14:43:48 +02:00
Rainer Gerhards
11f0639653 refactor 2014-05-26 12:53:32 +02:00
Rainer Gerhards
fd6372cd0e refactor 2014-05-26 11:54:57 +02:00
Rainer Gerhards
704d1e853e refactor 2014-05-26 11:29:27 +02:00
Rainer Gerhards
63fbcbc677 rewrite usage() function 2014-05-26 11:04:49 +02:00
Rainer Gerhards
fbdd7fc188 cleanup 2014-05-26 10:56:55 +02:00
Rainer Gerhards
9a1cf56bbc last commit introduced regression, fixing this 2014-05-26 10:50:40 +02:00
Rainer Gerhards
a704876f29 split syslogd.c file into GPLv3 and ASL 2.0 parts 
This is just the initial commit, we need to shuffle more
code, but need to check carefully that what we do is correct
(proper code ownership).

See also: https://github.com/rsyslog/rsyslog/issues/82
 2014-05-26 10:03:57 +02:00
Rainer Gerhards
618bd2844c Merge branch 'v7-stable' into v8-stable 
Conflicts:
	grammar/grammar.y
 2014-05-22 15:44:22 +02:00
Rainer Gerhards
405206bfe9 update license to ASL 2.0 2014-05-22 15:40:54 +02:00
Rainer Gerhards
71a364c49d Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/smfile.c
	tools/smfwd.c
	tools/smtradfile.c
	tools/smtradfwd.c
 2014-05-22 12:26:15 +02:00
Rainer Gerhards
55b8882550 update license to ASL 2.0 
see also: https://github.com/rsyslog/rsyslog/issues/82
 2014-05-22 12:22:07 +02:00
Rainer Gerhards
be703ebcfd Merge branch 'v7-stable' into v8-stable 2014-05-05 08:39:21 +02:00
Rainer Gerhards
1031f7b079 removed obsolete --disable-fsstnd configure option 
Thanks to Thomas D. for alerting us.
Closes: https://github.com/rsyslog/rsyslog/issues/72
 2014-05-05 08:38:36 +02:00
Rainer Gerhards
3065e0fbcd add support for specifying the liblogging-stdlog channel spec 
new global parameter "stdlog.channelspec"
 2014-04-01 12:41:51 +02:00
Karol Jurak
1b536ae0b2 omfile: add module parameters: FileOwner, FileOwnerNum, FileGroup, ... 2014-03-31 13:01:43 +02:00
Rainer Gerhards
932e6bf7bd Merge branch 'v7-stable' into v8-stable 
Conflicts:
	tools/ompipe.c
 2014-03-26 18:01:17 +01:00
Rainer Gerhards
094c9e9626 bugfix: ompipe used invalid default template 
This is a regression from an old change (didn't track it down precisely,
but over a year ago). It used the Forwarding template instead of
the file template (so we have a full syslog header). This fix corrects
it back to previous behaviour, but new scripts that used the wrong
format may now need to have the RSYSLOG_ForwardingFormat template
explicitely be applied.
closes: https://github.com/rsyslog/rsyslog/issues/50
 2014-03-25 15:24:49 +01:00
Rainer Gerhards
7ef8e5d78d fix missing argument 
unfortunately, during cleanup of code for
https://github.com/rsyslog/rsyslog/issues/35
I removed a bit too much and noticed the compiler warning
too late.
 2014-03-25 15:19:42 +01:00
Rainer Gerhards
a79b07fcd2 bugfix: ompipe did emit many suspension messages for /dev/xconsole 
(hopefully now) closes: https://github.com/rsyslog/rsyslog/issues/35
When it was present, but nobody reading from it. The problem
is the way the rsyslog v7 engine tries to resolve failures in outputs.
It does some retries, and along those lines some state information gets
lost and it is close to impossible to retain it. However, the actual
root problem is that ompipe does not reliably detect if it is able to
recover. The problem here is that it actually does not know this
before it does an actual write. These two things together mess up the
logic that suppresses invalid resumption/suspension messages
(actually, the plugin switches state really that often).
Nevertheless, the prime problem with /dev/xconsole (and probably
most other pipes as well) is that it gets full. So I have now added
code that checks, during resume processing, if the pipe is writable.
If it is not, resume is deferred. That should address the case.
 2014-03-25 15:12:14 +01:00
Rainer Gerhards
04f185eedd Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2014-03-19 16:05:21 +01:00
Rainer Gerhards
dec39dba8c silence compiler warning 2014-03-17 12:09:39 +01:00
Rainer Gerhards
68710a4068 fix broken build process due to imported patch 
I obviously did not check carefully enough the results of
that import. Thanks to Tomas Heinrich for alerting us, see:
https://github.com/rsyslog/rsyslog/issues/35#issuecomment-36146610

NOTE: this problems was not in released code, "just" the git tree.
 2014-02-26 18:07:30 +01:00
Rainer Gerhards
bda7b6db47 Merge branch 'v7-stable' 2014-02-23 12:45:43 +01:00
Rainer Gerhards
df77823d71 bugfix: ompipe did resume itself even when it was still in error 
See: https://github.com/rsyslog/rsyslog/issues/35
Thanks to github user schplat for reporting
 2014-02-23 12:42:16 +01:00
Rainer Gerhards
790ed9f8a0 Merge branch 'v7-stable' 
Conflicts:
	tools/omfile.c
 2014-02-23 12:35:02 +01:00
Rainer Gerhards
26f07e7597 typo fix 
Thanks to github user schplat for alerting us.
See (embedded in larger issue): https://github.com/rsyslog/rsyslog/issues/35
 2014-02-23 12:30:48 +01:00
Rainer Gerhards
5aaabc83da Merge branch 'v7-stable' 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/ompgsql/ompgsql.c
 2014-02-12 14:25:32 +01:00
Rainer Gerhards
771bc2fe5f Merge branch 'v7-stable' into v7-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2014-02-12 13:01:21 +01:00