summaryrefslogtreecommitdiffstats
path: root/plugins/imfile
Commit message (Collapse)AuthorAgeFilesLines
* undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-11/+11
| | | | The most common files are now changed, more needs to be done.
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-141-15/+14
|\ | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-141-15/+14
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * more files moved to ASL 2.0Rainer Gerhards2012-01-121-15/+14
| | |
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-2/+2
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-2/+2
| | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| * | backporting patch for clean make distcheckRainer Gerhards2011-03-161-0/+8
| | |
* | | fixed double-free regerssion, probably caused by last mergeRainer Gerhards2011-03-141-5/+0
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-141-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-141-0/+8
| |/ / | | | | | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench.
* | | bugfix: very minor memory leak in imfileRainer Gerhards2011-03-111-0/+5
| | | | | | | | | | | | | | | almost cosmetic: leaks a few bytes once during a run -- more a problem for valgrind testing -- not for practical use
* | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-0/+34
|\| | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-181-0/+34
| | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug.
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
| * | bugfix: very long running actions could prevent shutdown under some ↵Rainer Gerhards2011-02-111-3/+3
| | | | | | | | | | | | | | | | | | circumstances This has now been solved, at least for common situations.
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-6/+16
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | enhanced imfile to support non-cancel input terminationRainer Gerhards2011-02-101-6/+16
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-02-011-1/+7
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c
| * | enhanced imfile to support multi-line messagesDavid Lang2011-01-251-1/+7
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-0/+1
|\| | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-251-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
| | * | imfile improvementsRainer Gerhards2010-10-271-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| | * | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-201-3/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | | | Merge branch 'v4-devel' into v5-develroot2010-10-201-3/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | imfile improvementsRainer Gerhards2010-10-241-18/+17
| | | |/ | | |/| | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| | * | fixed incomplete mergeRainer Gerhards2010-10-151-0/+1
| | | |
| | * | imfile: bugfixes in regard to large files (> 2GB)Rainer Gerhards2010-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-151-1/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | imfile: bug fixesRainer Gerhards2010-10-151-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | either one or two bugs fixed ;) Definitely a problem where no state file is written when working with relative pathes. Also, some problems with offsets should be fixed for very large files. However, I could not yet experimentally show the issue so it probably needs more verification.
* / | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-8/+8
|/ / | | | | | | first step: adding object-type specifier to config statement table
* | my imfile cleanup was a bit too agressive ;)Rainer Gerhards2009-10-191-0/+1
| | | | | | | | ... so I moved the one line that some platforms need back in.
* | cosmetic: cleanup of imfileRainer Gerhards2009-10-161-35/+13
| |
* | removed no longer needed msg_t property "bParseHOSTNAME"Rainer Gerhards2009-10-131-1/+0
|/
* finished transition to using inputName propertyRainer Gerhards2009-06-301-1/+14
| | | | | ... plus some celanup and adding minor missing functionality (the rule debug info again tell the property name, not just number).
* introduced the idea of detached propertiesRainer Gerhards2009-06-291-1/+1
| | | | | | | | | | | | | some things inside the message can be used over a large number of messages and need to to be allocated and re-written every time. I now begin to implement this as a "prop_t" object, first use for the inputName. Some input modules are already converted, some others to go. Will do a little performance check on the new method before I go further. Also, this commit has some cleanup and a few bug fixes that prevented compiliation in debug mode (I overlooked this as I did not compile for debug, what I normally do, and the automatted test also does not do that)
* optimized hostname processingRainer Gerhards2009-06-231-1/+1
|
* optimized handling of MSG part in msg objectRainer Gerhards2009-06-181-1/+1
| | | | | WARNING: currently, message repeation processing is disabled, must be reenabled (but prefer to do some other tests first)
* optimized TAG handling in msg objectRainer Gerhards2009-06-181-1/+3
|
* cleaned up/optimized raw message handling in msg objectRainer Gerhards2009-06-181-1/+1
|
* Merge branch 'master' into omfileRainer Gerhards2009-06-161-2/+1
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
| * removed long-obsoleted property UxTradMsgRainer Gerhards2009-06-161-1/+0
| | | | | | | | | | ... as well as some cleanup (some commented-out code is left to support UxTradMsg again is someone really complains ;)).
| * some performance optimizationsRainer Gerhards2009-06-161-1/+1
| | | | | | | | | | | | - saved gettimeofday() calls in imtcp (and increased reception buffer) - somewhat optimized stringbuf.c - some other optimizations
* | added $OMFileIOBufferSize config directive and plumbingRainer Gerhards2009-06-041-2/+1
| |
* | cleaned up stream class ...Rainer Gerhards2009-06-041-24/+27
|/ | | | | | ... and also made it callable via an rsyslog interface rather then relying on the OS loader (important if we go for using it inside loadbale modules, which we soon possible will)
* added capability to run multiple tcp listeners (on different ports)Rainer Gerhards2009-05-221-2/+3
| | | | | | | | | | | Well, actually this and a lot of related things. I improved the testbench so that the new capabilities are automatically tested and also did some general cleanup. The current multiple tcp listener solution will probably receive some further cleanup, too, but looks quite OK so far. I also reviewed the way tcpsrv et all work, in preparation of using this code for imdiag. I need to document the findings, especially as the code is rather complicated "thanks" to the combination of plain tcp and gssapi transport modes.
* make all cflags and libs variables uppercaseMichael Biebl2009-02-241-1/+1
| | | | | | pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency.
* consolidated time calls during msg object creationRainer Gerhards2008-10-021-1/+0
| | | | | | ...this improves performance and consistency and also fixes a bug where subsecond time properties generated by imfile, imklog and internal messages could be slightly inconsistent.