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

9434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henri Lakk
fa5ad17eb0 The function getopt_long requires colons for flags, if there is a required parameter. 2016-02-18 15:14:48 +02:00
Henri Lakk
d823faaf5b Fixed typo on help. 2016-02-18 14:25:48 +02:00
Volker Fröhlich
68cb125083 A CEE cookie shall only be added when using the CEE format 2016-02-17 23:52:41 +01:00
Kenneth Giusti
cf5c020bb1 Fix clang compilation warnings 2016-02-17 15:44:40 -05:00
Rainer Gerhards
2e84681731 Merge branch 'fix-leading-underscore' of https://github.com/portante/rsyslog into merge-622 2016-02-17 18:21:37 +01:00
Rainer Gerhards
b74d06efc7 maintain ChangeLog 2016-02-17 17:24:11 +01:00
Rainer Gerhards
43e868a414 Merge branch 'travis-mongodb' into merge-706 2016-02-17 16:40:15 +01:00
Rainer Gerhards
4d4beb957f ommongodb: implement missing return value check 2016-02-17 15:39:57 +01:00
Rainer Gerhards
2f1f54b0da doc: extend package requirements for Ubuntu build 2016-02-16 15:41:34 +01:00
Rainer Gerhards
dbb8607529 ommongodb: fix alignment build warnings 2016-02-16 15:29:42 +01:00
Rainer Gerhards
43f2a61747 travis: enable building ommongodb 
closes https://github.com/rsyslog/rsyslog/issues/794
 2016-02-16 15:07:12 +01:00
Rainer Gerhards
64f1efdc15 Merge branch 'pull-mongo-extended-json' of https://github.com/Baqend/rsyslog into merge-706 2016-02-16 13:59:12 +01:00
Rainer Gerhards
b5649a9810 Merge branch 'testbench-imfile-endregex-vg' into master-candidate 2016-02-16 13:56:50 +01:00
Rainer Gerhards
e57756140e maintain ChangeLog 2016-02-16 13:02:46 +01:00
Rainer Gerhards
0e17c41aa5 imfile: fix race during startup that could lead to some duplication 
If a to-be-monitored file was created after inotify was initialized
but before startup was completed, the first chunk of data from this
file could be duplicated. This should have happened very rarely in
practice, but caused occasional testbench failures.

closes https://github.com/rsyslog/rsyslog/issues/791
 2016-02-16 12:55:11 +01:00
Rainer Gerhards
67a8d83926 Merge branch 'testbench-add-var-tests' of https://github.com/rgerhards/rsyslog into master-candidate 2016-02-16 08:34:21 +01:00
Kenneth Giusti
ebe27e8368 Output Module for AMQP 1.0-compliant brokers 2016-02-15 14:21:46 -05:00
Rainer Gerhards
2025d6535b Merge branch 'buildbot-solaris' into master-candidate 2016-02-15 18:50:04 +01:00
Rainer Gerhards
1ae447c1d6 buildbot: add script to build libfastjson on solaris buildbot runs 
Solaris does not have libfastjson packages, which we require. So we
add a script for our buildbot tests that builds its own local copy
from libfastjson git. This at least ensures we can run the buildbot
tests again on rsyslog solaris.
 2016-02-15 18:14:34 +01:00
Rainer Gerhards
74336033c3 maintain ChangeLog 2016-02-15 17:28:39 +01:00
Rainer Gerhards
553087e6c3 Merge branch 'merge-664' into master-candidate 2016-02-15 17:27:26 +01:00
Rainer Gerhards
1348225727 fix sign comparison build errors 2016-02-15 16:31:30 +01:00
Rainer Gerhards
42155cd5b4 Merge branch 'trim-line-over-bytes' of https://github.com/JindongChen/rsyslog into merge-664 
Conflicts:
	runtime/stream.h
 2016-02-15 15:45:40 +01:00
Rainer Gerhards
ea7d276007 testbench: fix compiler warnings in test tool 2016-02-15 15:40:53 +01:00
Rainer Gerhards
e6ee3765d1 Merge branch 'master-candidate' of https://github.com/janmejay/rsyslog into master-candidate 2016-02-14 18:12:16 +01:00
Rainer Gerhards
ea930307d7 maintain ChangeLog 2016-02-14 17:29:37 +01:00
Rainer Gerhards
3445eff33c Merge branch 'master' of https://github.com/madedotcom/rsyslog into master-candidate 2016-02-14 17:28:37 +01:00
Janmejay Singh
d662d18666 added a valgrind test to guard lookup-table no-hup-reload path 2016-02-11 23:39:42 +05:30
Janmejay Singh
1ac753761a added reloadOnHUP(defaults to on) parameter in lookup-table object (again, somehow overlooked this during proposal impl) 2016-02-11 23:23:22 +05:30
taotetek
3134a63d35 Merge pull request #779 from rsyslog/imfile_cee 
adds addceetag option to imfile
 2016-02-10 10:41:46 -05:00
Brian Knox
ecc71fa144 adds addceetag option to imfile 2016-02-08 11:56:44 -05:00
Bob Gregory
cd214f6825 Added templating to omjournal 
* Any fields in an incoming template are automatically added to
  the journald log entry.

  eg.

  template(name="journaljson" type="list"){
     property(name="$!@message" outname="MESSAGE")
     property(name="$!@fields!levelname" outname="LEVEL")
     property(name="$!@fields!funcName" outname="CODE_FUNC")
     property(name="$!@fields!lineno" outname="CODE_LINE")
     property(name="$!@fields!filename" outname="CODE_FILE")
     property(name="syslogtag" outname="SYSLOG_IDENTIFIER")
  }

* This uses the same TPL_AS_JSON trick as ommongodb

Fixing clang-analyze error

When using json_object_foreachC to enumerate our json obj, clang
was unable to statically check that all the iovec instances had
been correctly initialised.

Instead, we use an explicit for loop. It's uglier, but it does
pass static analysis.
 2016-02-08 09:56:22 +00:00
Rainer Gerhards
120152a5e9 Merge branch 'merge-travis-mysql' into master-candidate 2016-02-07 18:49:10 +01:00
Rainer Gerhards
cf6fb2120f travis: install disallowed packages via sudo 2016-02-07 18:11:46 +01:00
Rainer Gerhards
ddd70ef577 add libdbi drivers for mysql 
This is required because when we enable mysql testing, libdbi is
also tested against it (what makes a lot of sense).
 2016-02-07 18:00:52 +01:00
Rainer Gerhards
87a694df69 Merge branch 'mysql-tests-travis' of https://github.com/alorbach/rsyslog-1 into merge-travis-mysql 2016-02-07 17:58:42 +01:00
Rainer Gerhards
9b7f73ebe6 Merge branch 'master-insecure' into master-candidate 2016-02-07 11:26:26 +01:00
Rainer Gerhards
1b7e04884e Merge pull request #578 from janmejay/master-insecure 
loookup-table impl (covers proposal)
 2016-02-07 11:24:03 +01:00
Janmejay Singh
ad2574837d FreeBSD does not have pthread_setname_np, this makes it optional (lookup-table reloader thread-name will not be set in environments that do not have pthread_setname_np for) 2016-02-08 05:16:50 +05:30
Rainer Gerhards
86518292c4 maintain ChangeLog 2016-02-07 11:23:28 +01:00
Janmejay Singh
50eeca2f49 fixes test/Makefile.am which had an incorrect (statement terminating) entry in EXTRA_DIST + another incorrect conditional test entry 2016-02-05 00:51:57 +05:30
Andre Lorbach
55bf7ac742 testbench: activated mysql tests for travis 2016-02-04 19:53:55 +01:00
Janmejay Singh
af2ab69695 fixed multiple_lookup_tables test which wasn't cleaning up after itself (wasn't shutting down rsyslog or killing various tmp files) 2016-02-04 19:08:18 +05:30
Janmejay Singh
234d23845d fixed a few static-analysis bugs in lookup-table impl 2016-02-04 17:58:10 +05:30
Rainer Gerhards
054f517113 testbench: tests were executed even if necessary modules were missing 2016-02-04 13:25:34 +01:00
Rainer Gerhards
4a116b5857 testbench: add more tests for variable concurrency situations 2016-02-04 13:22:19 +01:00
Rainer Gerhards
bd5cd16667 improve test 2016-02-04 13:22:19 +01:00
Janmejay Singh
25cc42c2ff pre-merged upstream for a clean merge-back 2016-02-04 16:14:21 +05:30
Rainer Gerhards
37e83b23f7 Merge branch 'fix-queue-shutdown' into master-candidate 2016-02-03 18:15:10 +01:00
Rainer Gerhards
a8739dbba2 maintain ChangeLog 2016-02-03 17:13:33 +01:00