summaryrefslogtreecommitdiffstats
path: root/plugins/omprog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-01-271-0/+6
|\ | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-271-0/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-271-0/+6
| | |\
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+6
| | | | | | | | | | | | | | | | configured
* | | | omprog: added support for v6 config systemRainer Gerhards2012-01-271-0/+67
| | | |
* | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-3/+2
| | | |
* | | | 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 II (now finished)Rainer Gerhards2012-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
| * | | 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
* | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | |
* | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-191-1/+1
| |_|/ |/| |
* | | 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>
* | fixed regression from last commitRainer Gerhards2010-07-271-0/+1
| | | | | | | | config variables were not properly initialized
* | milestone commit: output plugin interface changes (may NOT run)Rainer Gerhards2010-07-271-13/+17
| | | | | | | | | | | | | | The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt).
* | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-2/+2
|/ | | | first step: adding object-type specifier to config statement table
* minor cleanup (cosmetic)Rainer Gerhards2010-04-151-2/+1
|
* re-enabled pipe, tty and console in omfileRainer Gerhards2009-06-121-1/+1
| | | | | | | ... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
* improved omprog, now ready for first practical testingRainer Gerhards2009-04-011-8/+161
|
* initial work on omprog, an output module to send messages to another programRainer Gerhards2009-04-012-0/+212