summaryrefslogtreecommitdiffstats
path: root/plugins/ommysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-05-031-1/+19
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-1/+19
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-031-1/+11
| | |
| | * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-031-1/+9
| | | | | | | | | | | | | | | | | | | | | This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
* | | Merge branch 'v6-stable'Rainer Gerhards2012-02-031-16/+14
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
| |\|
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| | |\
| | | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| | | | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | | ommysql: added support for v6 config formatRainer Gerhards2012-02-021-0/+98
| | | |
* | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-3/+2
| | | |
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | 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>
* | | Merge branch 'v5-devel'Rainer Gerhards2011-02-011-0/+39
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c
| * | added $OMMySQLConfigFile/$OMMySQLConfigSection config directivesAriel P2011-01-311-0/+39
| |/ | | | | | | 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-7/+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
* 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.
* Improve mysql configure check (for unusual paths)Michael Biebl2009-02-241-2/+1
| | | | | | | | | | | Remove AC_CHECK_HEADERS([mysql/mysql.h],...) as this was causing pain for users where the mysql headers are not installed in the system include directory. It was superfluous anyways, as we check for mysql_config and set the include path to the correct directory. Update ommysql.c to use #include <mysql.h>, as mysql_config will set the include path to /path/to/include/mysql/ so <mysql/mysql.h> would not work. Remove errmsg.h include as it is not used.
* make all cflags and libs variables uppercaseMichael Biebl2009-02-241-2/+2
| | | | | | 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.
* Merge branch 'v3-stable' into betaRainer Gerhards2008-08-131-3/+21
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| * enhanced ommysql to support custom port to connect to serverRainer Gerhards2008-08-121-3/+21
| | | | | | | | | | | | Port can be set via new $ActionOmmysqlServerPort config directive Note: this was a very minor change and thus deemed appropriate to be done in the stable release.
* | added (internal) error codes to error messagesRainer Gerhards2008-06-271-4/+4
| | | | | | | | | | Also added redirector to web description of error codes closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
* | Remove .cvsignore files, add .gitignore.Michael Biebl2008-06-111-6/+0
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | 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
* | moved files to the runtimeRainer Gerhards2008-04-161-1/+1
| | | | | | | | | | | | there are still some files left which could go into the runtime, but I think we will delete most of them once we are done with the full modularization.
* | made everything compile with the new runtime subdirectoryRainer Gerhards2008-04-161-1/+1
|/
* removed a now-longer needed callback from the output module interface.Rainer Gerhards2008-03-221-5/+0
| | | | Results in reducing code complexity.
* fixed a few remaining logerror() calls - thanks to Michael Biebl forRainer Gerhards2008-03-061-4/+7
| | | | pointing that out
* applied patch from Michael Biebl to clean up build systemRainer Gerhards2008-03-061-2/+2
|
* - 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
* created an initial version of omlibdbi (does not yet work)Rainer Gerhards2008-02-141-3/+1
|
* - changed the ommysql output plugin so that the (lengthy) connectionRainer Gerhards2008-01-301-9/+14
| | | | | | | initialization now takes place in message processing. This works much better with the new queued action mode (fast startup) - fixed a newly introduced bug that caused output module's doAction entry point to be called on more than one thread under some circumstances
* added --enable-mudflap ./configure optionRainer Gerhards2008-01-081-2/+2
|
* applied Michael Biebl's patch to clean up the makefilesRainer Gerhards2008-01-031-2/+2
|
* removed single-threading support for sending TCP messages; causedRainer Gerhards2007-12-201-10/+0
| | | | | simplyfication of output module interface as well as core syslog processing.
* code cleanups thanks to Michael BieblRainer Gerhards2007-12-181-2/+2
|
* - begun to create input module interface and macrosRainer Gerhards2007-12-141-0/+2
| | | | - changed module interface to include function to query type
* changed license to GPLv3 (for what is to become rsyslog v3)Rainer Gerhards2007-12-142-14/+16
|
* fixed an off-by-one bug that created problems when :ommysql: syntax wasRainer Gerhards2007-12-041-1/+1
| | | | used. Thanks to sur5r for pointing this out.
* some code cleanupRainer Gerhards2007-12-032-2/+0
|
* removed no longer necessary function prototype definitionsRainer Gerhards2007-12-031-6/+0
|
* added compile-time switches for -pthreadRainer Gerhards2007-11-301-1/+1
|
* added .cvsignore files as suggested by Michael BieblRainer Gerhards2007-11-301-0/+6
|
* added new modExit() entry point to loadable module interfaceRainer Gerhards2007-11-212-1/+6
|