57 Commits

Author SHA1 Message Date
Jared Johnson
9fd5e8c7d3 Don't lose uncommitted data on DB retries
Backport ompgsql2 patch to avoid losing uncommitted data on DB retries.

Bugzilla bug for this issue: http://bugzilla.adiscon.com/show_bug.cgi?id=528
Original ompgsql2 patch: http://bugzilla.adiscon.com/show_bug.cgi?id=453#c5
2014-09-04 12:40:32 +02:00
James Le Cuirot
ee54d0e4dc fix broken PostgreSQL database creation
Quoting is really really important under PostgreSQL. Giving the
database name in single quotes simply won't work. Giving it in double
quotes is not the same as not quoting it at all. rsyslog has
traditionally connected case-sensitively to "Syslog" but accessed the
tables case-insensitively so we should follow suit here.

Furthermore, you cannot create a table based on template1 with a
different encoding. template0 must be used instead.
2014-06-13 17:20:50 +01:00
Rainer Gerhards
5aaabc83da Merge branch 'v7-stable'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/ompgsql/ompgsql.c
2014-02-12 14:25:32 +01:00
Rainer Gerhards
432ee7dcf1 ompgsql: remove unnecessary connetion open/close at startup 2014-02-12 09:33:56 +01:00
Rainer Gerhards
05fb31bce1 correcting a slightly wrong code location
did have no effect, but could cause trouble with future plugin
interface changes.
2014-02-10 16:06:55 +01:00
Alain
ff091b7ea9 ompgsql bugfix: improper handling of auto-backgrounding mode 2014-02-10 16:04:08 +01:00
Rainer Gerhards
ccca729c55 ompgsql: very minimal support for v8 omod interface
TX DISABLED, single instance, untested - but at least it builds so
that users can test...
2013-11-13 12:59:36 +01:00
Rainer Gerhards
b68af9a016 cosmetic: remove compiler warnings 2012-01-19 15:41:49 +01:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
bbe1f2688c renaming conf.* wasn't a good idea -- undoing
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741 renamed conf.c to legacyconf.c to make room for new config system 2011-04-19 07:53:23 +02:00
Rainer Gerhards
b30e809a20 Merge branch 'v5-devel'
Conflicts:
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
	runtime/msg.c
	runtime/rsyslog.h
	template.c
2011-03-31 17:08:01 +02:00
Christian Kastner
9003632c7d Force ANSI SQL treatment of strings for Postgres
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-03-29 12:00:56 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
2011-03-11 10:24:58 +01:00
Bojan Smojver
d1eb6e0edc added work-around for bug in gtls, which causes fd leak when using TLS
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>
2011-02-23 11:25:43 +01:00
Rainer Gerhards
d460c1cd5d fixed regression from last commit
config variables were not properly initialized
2010-07-27 11:38:25 +02:00
Rainer Gerhards
d18b238f16 milestone commit: output plugin interface changes (may NOT run)
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).
2010-07-27 09:44:35 +02:00
Rainer Gerhards
e8fafeadb8 made ompgsql identify its version on load 2010-05-07 13:23:04 +02:00
Rainer Gerhards
c8ebe62337 Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
	template.c
	tests/Makefile.am
	tests/parsertest.sh
2010-02-10 16:35:12 +01:00
Marc Schiffbauer
184d8cf6d2 improved PostgreSQL database create script, provided doc on PostgreSQL setup
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-08 14:20:15 +01:00
Rainer Gerhards
d3592db45b bugfix: ompgsql did not properly check the server connection in tryResume()
what could lead to rsyslog running in a thight loop.
Also did some code cleanup of previous patch.
2009-12-16 16:21:52 +01:00
Rainer Gerhards
42ff3e6bc1 made ompgsql behave correctly with older rsyslog core versions 2009-12-11 13:00:52 +01:00
Rainer Gerhards
c912598199 bugfix: ompgsql had problems with transaction support, what actually rendered it unsuable.
Thanks to forum user "horhe" for alerting me on this bug
and helping to debug/fix it!
2009-12-11 12:17:02 +01:00
Rainer Gerhards
b5f3387357 Merge branch 'omfile' into v5-devel
Note that this was NOT a trivial merge, and there may be
some issues. This needs to be seen when we continue developing.

Conflicts:
	runtime/msg.h
	runtime/obj.h
	runtime/queue.c
	runtime/srUtils.h
	runtime/stream.c
	runtime/stream.h
	runtime/wti.c
	tests/Makefile.am
	tools/omfile.c
	tools/syslogd.c
2009-06-16 13:59:09 +02:00
Rainer Gerhards
e3d9843c85 re-enabled pipe, tty and console in omfile
... 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.
2009-06-12 11:47:00 +02:00
Rainer Gerhards
10bab38993 begin implementation of new transactional output module interface
code is not complete, error cases are not handled.
2009-04-27 15:40:54 +02:00
Rainer Gerhards
63d3982721 Merge branch 'v3-stable' into beta 2009-04-17 14:19:43 +02:00
Rainer Gerhards
53bff58625 Merge branch 'debian_lenny' into v3-stable 2009-04-17 14:19:22 +02:00
Rainer Gerhards
9ebbe7477c Merge branch 'v2-stable' into debian_lenny 2009-04-17 14:19:02 +02:00
Rainer Gerhards
e8c94fcd89 bugfix: ompgsql did not detect problems in sql command execution
this could cause loss of messages. The handling was correct if the
connection broke, but not if there was a problem with statement
execution. The most probable case for such a case would be invalid
sql inside the template, and this is now much easier to diagnose.
2009-04-17 14:18:39 +02:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
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.
2009-02-24 13:09:44 +01:00
Rainer Gerhards
197d980f5b Merge branch 'v2-stable' into debian_lenny 2008-12-18 13:42:56 +01:00
Rainer Gerhards
2f1c53dbfe Merge branch 'v2-stable' into v3-stable
Conflicts:

	ChangeLog
2008-11-18 12:32:21 +01:00
Ken
48319cd31f bugfix: removed memory leak in ompgsql
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-11-18 12:30:57 +01:00
Rainer Gerhards
3f6c73a8b7 added (internal) error codes to error messages
Also added redirector to web description of error codes
closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
2008-06-27 12:52:45 +02:00
Michael Biebl
b6b53972e1 Remove .cvsignore files, add .gitignore.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-06-11 17:03:47 +02:00
Rainer Gerhards
d9b0c77d3e some more cleanup
reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear
2008-04-16 15:27:53 +02:00
Rainer Gerhards
d7f33053da made everything compile with the new runtime subdirectory 2008-04-16 08:42:00 +02:00
Rainer Gerhards
cdcc0e6710 removed a now-longer needed callback from the output module interface.
Results in reducing code complexity.
2008-03-22 10:30:40 +00:00
Rainer Gerhards
15e8b33eed fixed a few remaining logerror() calls - thanks to Michael Biebl for
pointing that out
2008-03-06 09:44:16 +00:00
Rainer Gerhards
28dcc746bd applied patch from Michael Biebl to clean up build system 2008-03-06 07:39:32 +00:00
Rainer Gerhards
bc7d8ccebb - changed module interface to support querying obj interface (stage work)
- changed module interface version, as the interface change is quite large
2008-03-04 10:27:45 +00:00
Rainer Gerhards
e27555c468 added --enable-mudflap ./configure option 2008-01-08 16:13:42 +00:00
Rainer Gerhards
fc761b9fdc applied Michael Biebl's patch to clean up the makefiles 2008-01-03 14:08:58 +00:00
Rainer Gerhards
8a77bc82ac removed single-threading support for sending TCP messages; caused
simplyfication of output module interface as well as core syslog
    processing.
2007-12-20 14:34:40 +00:00
Rainer Gerhards
26059b310e applied some more cleanup provided by Michael Biebl 2007-12-19 07:14:21 +00:00
Rainer Gerhards
cfda6f9df8 applied some more cleanup provided by Michael Biebl 2007-12-19 07:11:42 +00:00
Rainer Gerhards
6a80d9ee50 - begun to create input module interface and macros
- changed module interface to include function to query type
2007-12-14 14:41:09 +00:00
Rainer Gerhards
004229dda6 changed license to GPLv3 (for what is to become rsyslog v3) 2007-12-14 11:21:57 +00:00