summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added doc for new ommysql directivesAriel P2011-02-011-0/+12
|
* added pmaixforwardedfrom message parserDavid Lang2011-02-014-0/+194
| | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* added $OMMySQLConfigFile/$OMMySQLConfigSection config directivesAriel P2011-01-312-0/+41
| | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-01-262-11/+29
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * preparing for v5.6.3v5.6.3Rainer Gerhards2011-01-263-3/+4
| |
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-01-262-10/+26
| |\
| | * imfile bugfix: potential duplication of log contentRainer Gerhards2011-01-102-13/+12
| | | | | | | | | | | | | | | | | | Under some circumstances an invalid truncation was detected. This code has now been removed, a file change (and thus resent) is only detected if the inode number changes.
| | * forgot the actual patch with the last commit :(Rainer Gerhards2010-12-171-1/+1
| | |
| | * bugfix: imfile potentially duplicates linesRainer Gerhards2010-12-172-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen when 0 bytes are read from the input file, and some writer appends data to the file BEFORE we check if a rollover happens. The check for rollover uses the inode and size as a criterion. So far, we checked for equality of sizes, which is not given in this scenario, but that does not indicate a rollover. From the source code comments: Note that when we check the size, we MUST NOT check for equality. The reason is that the file may have been written right after we did try to read (so the file size has increased). That is NOT in indicator of a rollover (this is an actual bug scenario we experienced). So we need to check if the new size is smaller than what we already have seen!
* | | Merge branch 'v5-devel-david-imfile' into v5-develRainer Gerhards2011-01-265-29/+101
|\ \ \
| * | | enhanced imfile to support multi-line messagesDavid Lang2011-01-255-29/+101
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | pmciscomsg: fixed some problemsDavid Lang2011-01-251-4/+9
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | integrated pmciscomsg into the build systemRainer Gerhards2011-01-132-0/+19
| | | |
* | | | added pmcisconames (uncompiled & untested)David Lang2011-01-132-0/+161
|/ / / | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5.6.2-newimudp' into v5-devel-newimudpRainer Gerhards2011-01-108-4/+212
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imudp/imudp.c threads.c
| * | | improved imudp real-time scheduling support & bugfixDražen Kačar2011-01-108-3/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code had quite some issues, which are fixed by this commit. Also we do more error checking now. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-devel' into v5-devel-newimudpRainer Gerhards2011-01-101-42/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c
| * | | | imudp: removing new scheduling priority setting codeRainer Gerhards2011-01-102-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | as it had too many implications. This will now be part of v5 only.
| * | | | added support for systems without epoll_create1()Rainer Gerhards2010-12-172-2/+20
| | | | |
* | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-179-82/+130
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| * | | | added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settingsRainer Gerhards2010-12-173-0/+44
| | | | |
| * | | | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-166-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| * | | | cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-1618-39/+28
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: runtime/parser.c
| * | | | Fix the build system to build outisde CERN.Luis Fernando Muñoz Mejías2010-11-301-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should build against Oracle 11, too. Depending on the user's installation, either a single ORACLE_HOME environment variable or ORACLE_LIB_PATH and ORACLE_INCLUDE_PATH environment variables will be needed.
| * | | | Fix a potential missing '\0' on too long strings.Luis Fernando Muñoz Mejías2010-11-302-48/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By implementing a trivial strlcpy it's much easier to detect string truncations and react to them. This also gives a noticeable speedup in buffer handling (can be HUGE), since strlcpy() doesn't clear all the buffer entry before writing data. Converted all uses of strncpy() into strlcpy(). Also, we don't need to check for some null pointers, as there are no malloc-like operations in the doAction loop.
| * | | | bugfix: atomic increment for msg object may not work correct on all platforms.Chris Metcalf2010-11-252-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | added forgotten testcase filesv4.7.3Rainer Gerhards2010-11-252-0/+25
| | | | |
| * | | | preparing for 4.7.3Rainer Gerhards2010-11-253-3/+3
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-11-251-5/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-11-242-0/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | doc/imfile: fixed small but important typoRainer Gerhards2010-10-201-1/+1
| | | | | | |
* | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-1720-98/+141
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | bug fixes in action processingRainer Gerhards2010-12-173-52/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: action processor released mememory too early, resulting in potential issue in retry cases (but very unlikely due to another bug, which I also fixed -- only after the fix this problem here became actually visible). - bugfix: batches which had actions in error were not properly retried in all cases
| * | | | | | used a bit more stack (irrelevant) to gain a bit more performance...Rainer Gerhards2010-12-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for large batches
| * | | | | | bugfix: batch processing flagged invalid message as "bad" under some ↵Rainer Gerhards2010-12-165-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | circumstances also fixed some cosmetic nits
| * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-1613-25/+29
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | * | | | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-1614-32/+18
| | | | | | |
| | * | | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-12-163-3/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | improved some code based on clang static analyzer resultsRainer Gerhards2010-12-163-3/+6
| | | | | | | |
| | * | | | | | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-302-4/+4
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | Merge branch 'v4.4.2a' into v4-stableRainer Gerhards2010-11-251-5/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imfile/imfile.c runtime/stream.c
| | | * | | | | patched version numberRainer Gerhards2010-10-151-1/+1
| | | | | | | |
| | | * | | | | bugfix: a couple of problems that imfile had on some platformsRainer Gerhards2010-10-152-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namely Ubuntu (not their fault, but occured there)
| | | * | | | | bugfix: imfile utilizes 32 bit to track offsetRainer Gerhards2010-10-153-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, this problem can not experienced on recent Fedora 64 bit OS (which has 64 bit long's!)
| | * | | | | | final preparations for releasev4.6.5Rainer Gerhards2010-11-241-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | | | | |
| * | | | | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-165-8/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
| * | | | | preparing for 5.6.2v5.6.2Rainer Gerhards2010-11-303-3/+3
| | | | | |
* | | | | | systemd: add ExecReload command (using kill -HUP)Michael Biebl2010-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | http://0pointer.de/public/systemd-man/systemd.service.html