summaryrefslogtreecommitdiffstats
path: root/plugins/imfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-12/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * 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 'v5-stable' into masterRainer Gerhards2012-01-181-15/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.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 'beta'Rainer Gerhards2011-10-171-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | 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.
* | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-1/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | | imfile: added $InputFileMaxLinesAtOnce directiveRainer Gerhards2011-05-241-1/+10
| | | | |
| * | | | enhanced imfile to support input batchingRainer Gerhards2011-05-241-1/+13
| | |/ / | |/| |
| * | | backporting patch for clean make distcheckRainer Gerhards2011-03-161-0/+8
| | | |
* | | | imfile is being totally refactored -- add new conf system when doneRainer Gerhards2011-05-201-24/+0
| | | | | | | | | | | | | | | | otherwise we may waste a lot of effort...
* | | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-051-2/+2
| | | | | | | | | | | | | | | | as far as we know that new interface right now ;)
* | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-0/+29
| | | |
* | | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-1/+1
| |/ / |/| |
* | | 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
|
generated by cgit (git 2.34.1) at 2024-05-03 14:01:43 +0000