summaryrefslogtreecommitdiffstats
path: root/plugins/immark/immark.c
Commit message (Collapse)AuthorAgeFilesLines
* immark: support for module() global config parameters addedRainer Gerhards2012-06-271-3/+67
|
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | 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
| | * | relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
| | | | | | | | | | | | | | | | after carful check for copyright holder
* | | | Merge branch 'beta'Rainer Gerhards2011-08-311-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: action.c
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-0/+1
| |\| |
| | * | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | | |
* | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | |
* | | | step: generalized new config interface for all module typesRainer Gerhards2011-05-061-0/+1
| | | |
* | | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-051-2/+2
| | | | | | | | | | | | | | | | as far as we know that new interface right now ;)
* | | | step: small improvements to input mod config plumbingRainer Gerhards2011-05-031-3/+0
| | | |
* | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-12/+53
|/ / /
* | | 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>
* | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-2/+2
|/ / | | | | | | first step: adding object-type specifier to config statement table
* | some minor cleanup, consolidated some codeRainer Gerhards2009-10-161-8/+2
| |
* | enhanced immark to support non-cancel input module terminationRainer Gerhards2009-10-121-2/+16
|/
* moved bParseHostname and bIsParsed to msgFlagsRainer Gerhards2008-10-091-0/+1
| | | | | | This enables us to use more efficient calling conventions and also helps us keep the on-disk structure of a msg object more consistent in future releases.
* performance optimization: unnecessary time() calls during message parsing ↵Rainer Gerhards2008-09-161-1/+1
| | | | | | removed thanks to David Lang for his excellent performance analysis
* Merge branch 'master' into betaRainer Gerhards2008-07-151-2/+3
|\
| * added (internal) error codes to error messagesRainer Gerhards2008-06-271-1/+2
| | | | | | | | | | Also added redirector to web description of error codes closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
| * completed better modularity of runtimeRainer Gerhards2008-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | - added the ability to specify an error log function for the runtime - removed dependency of core runtime on dirty.h Note that it is "better" modularity, not perfect. There is still work to do, but I think we can for the time being proceed with other things.
| * some more cleanupRainer Gerhards2008-04-161-1/+1
| | | | | | | | | | reduced dependencies, moved non-runtime files to its own directory except for some whom's status is unclear
* | bugfix: mark messages were not correctly written to text log filesRainer Gerhards2008-07-151-0/+2
|/ | | | | | | the markmessageinterval was not correctly propagated to all places where it was needed. This resulted in rsyslog using the default (20 minutes) in some code pathes, what looked to the user like mark messages were never written.
* - changed modules.c calling conventions to be interface-basedRainer Gerhards2008-03-051-13/+0
| | | | | | | | | | | - moved module loader from conf.c to module.c, where it belongs - made the necessary plumbing to auto-load library modules - upgraded debug system to include iRet in function exit message - changed module interface so that instances need only to be supported by output plugins (if we actually need them for input plugins, we can always add it again...) - milestone: first implementation of library modules (but do not get unloaded on exit/hup so far)
* - changed module interface to support querying obj interface (stage work)Rainer Gerhards2008-03-041-1/+1
| | | | - changed module interface version, as the interface change is quite large
* fixed issue left over from debuging :(Rainer Gerhards2008-02-011-2/+1
|
* - some cleanupRainer Gerhards2008-01-101-1/+0
| | | | | - implemented management function for worker thread 0 in order to change queue workers dynamically -- stage work
* - fixed a bug that caused a segfault on startup when no $WorkDir directivev3-10-1aRainer Gerhards2008-01-101-1/+0
| | | | | | was specified in rsyslog.conf - fixed a bug that caused a segfault on queues with types other than "disk" - removed the now longer needed thread TermSyncTool
* - working on a potential race condition on the new input module interface.Rainer Gerhards2007-12-201-0/+1
| | | | | | | | | | See newsgroup posting for details on the issue: http://groups.google.com/group/comp.programming.threads/msg/330b9675f17 a1ad6 I tried some mutex operations but came to the conclusion that this does not really help. So I have now switched to plain thread cancellation, which so far seems to be OK. Need more practical experience with other input modules to make a final decision. Thus I leave all code in and have just disabled the problematic code.
* - implemented afterRun input module interface functionRainer Gerhards2007-12-171-0/+5
| | | | - implemented $klogSymbolsTwice config directive
* begun imklog, replacing klogd.c (finally we get rid of it...)Rainer Gerhards2007-12-171-3/+1
|
* command $ResetConfigVariables implemented for immark.cRainer Gerhards2007-12-171-1/+11
|
* implemented $MarkMessagePeriod config directiveRainer Gerhards2007-12-171-4/+10
|
* moved thread termination code out to threads.cRainer Gerhards2007-12-171-17/+13
|
* tried to work-around zlib compile problem in immark.c on some platformsRainer Gerhards2007-12-171-1/+1
|
* graceful termination now supportedRainer Gerhards2007-12-141-1/+2
|
* on the way to a real input module interface and threading class...Rainer Gerhards2007-12-141-4/+12
|
* - begun to create input module interface and macrosRainer Gerhards2007-12-141-6/+40
| | | | - changed module interface to include function to query type
* changed license to GPLv3 (for what is to become rsyslog v3)Rainer Gerhards2007-12-141-7/+8
|
* begin work on on immark, the first input module. In the long term this willRainer Gerhards2007-12-141-0/+79
lead to a complete rewrite of the input system