summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: add recent patch to ChangeLogRainer Gerhards2013-04-091-0/+2
|
* Utilize the new rsCStr*Strf() functionsTomas Heinrich2013-04-091-23/+9
|
* Check return code from gnutls_x509_crt_get_*_dnTomas Heinrich2013-04-091-20/+35
| | | | Enlarge the supplied buffer if necessary.
* Add new string functions that take a printf-style fmtTomas Heinrich2013-04-092-0/+79
|
* bugfix in testbenchRainer Gerhards2013-04-091-1/+6
| | | | | | | I initially thought the testbench had found some regression, but it turned out that a bugfix fixed a situation that the testbench had (invalidly) relied on. I have now adapted the testbench to how things really need to be.
* Merge branch 'c7' into tmpRainer Gerhards2013-04-0910-9/+63
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/queue.c
| * make imrelp properly terminate on system shutdownRainer Gerhards2013-04-094-4/+13
| | | | | | | | it didn't do so if it was inside a retry loop
| * add output module interface to facilitate cooperative shutdownRainer Gerhards2013-04-086-2/+35
| | | | | | | | | | | | ... in more complex cases (where receiving SIGTTIN is not sufficient). See also: http://blog.gerhards.net/2013/04/rsyslog-output-plugin-wrangling.html
| * omrelp: add ability to specify session timeoutRainer Gerhards2013-04-084-3/+15
| |
* | Merge branch 'c7'Rainer Gerhards2013-04-084-46/+128
|\| | | | | | | | | Conflicts: ChangeLog
| * omrelp: add support for RainerScript-based configurationRainer Gerhards2013-04-084-46/+128
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-04-085-76/+185
|\| | | | | | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c
| * bugfix: failover/action suspend did not work correctlyRainer Gerhards2013-04-072-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | This was experienced if the retry action took more than one second to complete. For suspending, a cached timestamp was used, and if the retry took longer, that timestamp was already in the past. As a result, the action never was kept in suspended state, and as such no failover happened. The suspend functionalit now does no longer use the cached timestamp (should not have any performance implication, as action suspend occurs very infrequently). Also added some better debug logging for the action engine.
| * bugfix: nested if/prifilt conditions did not work properlyRainer Gerhards2013-04-044-65/+148
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=415
* | Merge branch 'v7-stable'Rainer Gerhards2013-04-041-0/+2
|\|
| * bugfix: script == comparison did not work properly on JSON objectsRainer Gerhards2013-04-042-0/+25
| | | | | | | | backport from 7.3 branch
* | cleanupRainer Gerhards2013-03-291-2/+0
| |
* | Merge branch 'v7-stable-info'Rainer Gerhards2013-03-296-15/+56
|\ \ | | | | | | | | | | | | | | | Conflicts: ChangeLog template.c
| * | permit substring extraction relative to end-of-string in templatesRainer Gerhards2013-03-296-15/+56
| |/
* | add RainerScript re_extract() functionRainer Gerhards2013-03-274-2/+114
| |
* | bugfix: imuxsock aborted under some conditionsRainer Gerhards2013-03-272-0/+8
| | | | | | | | regression from ratelimiting enhancements
* | logsig: minimal end-user docv7.3.9Rainer Gerhards2013-03-266-5/+112
| |
* | Check libsocket for getifaddrs()Martin Carpenter2013-03-261-1/+4
| |
* | logsig: needed to refactor parts of the reader as wellRainer Gerhards2013-03-263-6/+11
| | | | | | | | the previous refactoring broke that code
* | logsig: refactor code to not reley on undocumented libgt partsRainer Gerhards2013-03-262-41/+59
| |
* | logsig: fix memory leakRainer Gerhards2013-03-261-13/+29
| |
* | logsig: handle error casesRainer Gerhards2013-03-264-126/+281
| |
* | imudp: support user-selectable inputnameRainer Gerhards2013-03-264-27/+85
| |
* | Merge branch 'master-gt'Rainer Gerhards2013-03-256-197/+504
|\ \
| * | doc: update rsgtutil man page with new --extend optionRainer Gerhards2013-03-251-1/+28
| | |
| * | rsgtsig: finish implementation of 'extend' modeRainer Gerhards2013-03-254-28/+132
| | | | | | | | | | | | | | | | | | | | | | | | This is tested as far as possible. However, the actual extend case can only be tested in about three weeks from now when the next publication is out. I have done module-testing with a mockup extend call, so chances are great the final test will be passed.
| * | rsgtutil/milestone: basic 'extend' mode implementationRainer Gerhards2013-03-234-37/+118
| | | | | | | | | | | | | | | | | | | | | ... done up until the point where I need to wait for the timestamps to become extendible. So doing a milestone commit to make sure the work is inside the archive. Actual writing of the extended timestamp is missing.
| * | rsgtutil: basic plumbing for extend modeRainer Gerhards2013-03-231-6/+33
| | | | | | | | | | | | does not contain actual implementation
| * | rsgtutil: refactor 'verify' mode to use new tlv file read functionsRainer Gerhards2013-03-232-207/+27
| | |
| * | rsgtutil: refactor 'show-sigblock-params" modeRainer Gerhards2013-03-231-19/+8
| | |
| * | logsig: refactor 'dump' mode in rsgtutilRainer Gerhards2013-03-233-23/+281
| | | | | | | | | | | | | | | The way tlvrecords are processed is changed in order to provide better extensibility for further work.
| * | fix: librsgt.h was not put in distribution tarballRainer Gerhards2013-03-222-3/+4
| | |
* | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-03-223-24/+45
|\ \ \
| * \ \ Merge branch 'v7-stable'Rainer Gerhards2013-03-223-24/+45
| |\ \ \ | | | |/ | | |/|
| | * | build-sys: Change the compat library to noinstMichael Biebl2013-03-221-1/+1
| | | | | | | | | | | | | | | | It's supposed to be a convenience library and should not be installed.
| | * | Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-222-23/+44
| | |\ \
| | | * \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-222-23/+44
| | | |\ \
| | | | * | yet another update of the systemd files we need to carry...Rainer Gerhards2013-03-221-21/+42
| | | | | |
| | | | * | build-sys: Fix "update-systemd" targetMichael Biebl2013-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The urls have changed.
* | | | | | Merge branch 'master-gt'Rainer Gerhards2013-03-2214-30/+3068
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | doc: add doc for rsgtutilRainer Gerhards2013-03-223-17/+55
| | | | |
| * | | | rsgtutil: add new file type to file type detectionRainer Gerhards2013-03-222-0/+121
| | | | |
| * | | | Merge branch 'master' into master-gtRainer Gerhards2013-03-2248-175/+1600
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/rsyslog.h
| * | | | | logsig: complete initial version of verifierRainer Gerhards2013-03-195-85/+315
| | | | | |
| * | | | | Merge branch 'master-gt' of git+ssh://git.adiscon.com/git/rsyslog into master-gtRainer Gerhards2013-03-182-14/+15
| |\ \ \ \ \