summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix: wrong variable was populated in MsgGetProp()Rainer Gerhards2012-10-111-8/+8
| | | | problem in this morning's change, never released
* Merge branch 'master' into master-newtemplateRainer Gerhards2012-10-115-7/+11
|\ | | | | | | | | Conflicts: template.c
| * Merge branch 'beta'Rainer Gerhards2012-10-111-0/+1
| |\
| | * add missing prototypeRainer Gerhards2012-10-111-0/+1
| | |
| | * remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | |
| * | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+5
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
| | |
| | * fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | |
| | * fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | |
| * | Merge branch 'v6-devel'Rainer Gerhards2012-10-113-7/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: template.c
| | * | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | |
| | * | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | |
| | * | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | |
| | * | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | |
| | * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| | |\ \
| | * \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| | |\ \ \
* | | | | | slightly improve performance for $NOW family of system propertiesRainer Gerhards2012-10-111-17/+32
| | | | | |
* | | | | | do "template date call" only when actually neededRainer Gerhards2012-10-114-1/+56
| | | | | |
* | | | | | optimize: do "template time() call" only once per batchRainer Gerhards2012-10-103-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This still needs more optimizing as the call is very often NOT needed - but we need to know about the templates in that case.
* | | | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-105-33/+44
|/ / / / / | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each.
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | | | |
| * | | | prepare for 7.1.9 releasev7.1.9Rainer Gerhards2012-10-093-4/+4
| | | | |
| * | | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small.
* | | | | preparing for 7.3.0 releasev7.3.0Rainer Gerhards2012-10-083-3/+3
| | | | |
* | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
| | | | |
* | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-055-51/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
| * | | | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-146-51/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip.
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-046-28/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed.
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-045-28/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| | |\ \ \ \
| | | * | | | remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
| | * | | | | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
* | / | | | omlibdbi improvementsRainer Gerhards2012-10-043-44/+161
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work.
* | | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-042-0/+6
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-044-0/+32
|\| | | |
| * | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
| * | | | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| | | | |
| * | | | cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
| | | | |
* | | | | prepare for 7.1.8 releasev7.1.8Rainer Gerhards2012-10-023-6/+6
| | | | |
* | | | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-024-8/+35
| | | | |
* | | | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
| | | | |
* | | | | cleanupRainer Gerhards2012-10-021-3/+0
| | | | |
* | | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-022-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object.
* | | | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
| | | | | | | | | | | | | | | | | | | | modified: mmjsonparse.c
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-024-0/+482
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| | | | |
| * | | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | | | |
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-022-1/+3
|\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 13:23:23 +0000