Rainer Gerhards
4beff8dab6
Merge branch 'nextmaster' into oracle
...
Conflicts:
runtime/rsyslog.h
2009-04-16 17:28:29 +02:00
Rainer Gerhards
2d5e8ba7cd
added a new error code for too-old rsyslog core
...
which can be emittend when plugin can not load due to missing
core functionality.
2009-04-16 17:26:07 +02:00
Rainer Gerhards
3c886026be
added some doc for omoracle
2009-04-16 16:55:25 +02:00
Luis Fernando Muñoz Mejías
668f9a79fb
Fixing the batch insertions.
...
Previous versions inserted garbage (the pointer was interpreted as the
string itself). It seems inserting arrays of strings is not that easy
with OCI.
This approach consumes 2KB per entry in the batch, so if you have
batches of size 1000 you'll be using 2MB for the batch. This size
doesn't change, anyways and the risk of leaking memory is gone. OCI
doesn't deal well with batches of strings. :(
2009-04-16 15:28:01 +02:00
Luis Fernando Muñoz Mejías
ca28204f7b
Add the callback for OCIBindDynamic.
...
Let's hope it works.
2009-04-16 15:27:11 +02:00
Luis Fernando Muñoz Mejías
9a897329ec
Add some debugging output
2009-04-16 15:26:40 +02:00
Luis Fernando Muñoz Mejías
f89b761c84
Make the counting of bind parameters aware of literals.
...
Literal strings passed in the statement may contain ':', let's not
count them.
2009-04-16 15:26:09 +02:00
Luis Fernando Muñoz Mejías
24fcd96203
Fixed a mem leak
2009-04-16 15:25:29 +02:00
Luis Fernando Muñoz Mejías
65a85de3d9
Convert to the array-based interface.
...
We'll receive a single statement to be prepared and a batch
size. Then, doAction will execute the statement only once per batch
hit, making the process much more efficient.
This will reduce network and DB server overhead. The downside is that
this version cannot be used with rsyslog v3 anymore. If anyone is
interested on backporting the module, they should choose all patches
up to this one.
Better documentation may follow.
2009-04-16 15:24:52 +02:00
Rainer Gerhards
f07d74a87f
Merge branch 'master' into nextmaster
2009-04-16 14:59:04 +02:00
Rainer Gerhards
5ccec36e8d
highlighting $DirCreateMode fix
2009-04-16 14:58:46 +02:00
Rainer Gerhards
2368ccae46
Merge branch 'beta'
2009-04-16 14:58:10 +02:00
Rainer Gerhards
eec6aff6a9
Merge branch 'v3-stable' into beta
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2009-04-16 14:57:41 +02:00
Rainer Gerhards
481dca7c80
preparing for 3.20.6
2009-04-16 14:49:39 +02:00
Rainer Gerhards
6339d1d8c8
Merge branch 'debian_lenny' into v3-stable
...
Conflicts:
ChangeLog
2009-04-16 14:20:47 +02:00
Rainer Gerhards
140d5cf0f8
Merge branch 'v2-stable' into debian_lenny
...
Conflicts:
configure.ac
doc/manual.html
2009-04-16 14:18:20 +02:00
Rainer Gerhards
ccd426e0da
prepared for 2.0.7 & corrected default for $DirCreatemode
...
bugfix: the default for $DirCreateMode was 0644, and as such wrong.
It has now been changed to 0700. For some background, please see
http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
2009-04-14 15:36:23 +02:00
Rainer Gerhards
ba5a59128f
cosmetic fix (status message)
2009-04-09 20:48:08 +02:00
Rainer Gerhards
8a803c213d
Merge branch 'setrlimit' into nextmaster
2009-04-09 20:40:48 +02:00
Rainer Gerhards
c2c5c3912c
Merge branch 'setrlimit' of git+ssh://rger@git.adiscon.com/git/rsyslog into setrlimit
2009-04-09 20:40:10 +02:00
Rainer Gerhards
01e5d51c57
added doc for $MaxOpenFiles directive
2009-04-14 14:36:50 +02:00
Rainer Gerhards
04272876d1
implemented $MaxOpenFiles directive and changed testbench
...
... to utilize it. This work is not yet fully verified to be correct.
2009-04-14 13:52:07 +02:00
Rainer Gerhards
d0fd30be33
Merge branch 'setrlimit' into nextmaster
2009-04-09 20:39:09 +02:00
Rainer Gerhards
8d65a9cdd4
updated project status
2009-04-14 14:55:37 +02:00
Rainer Gerhards
85ccd6e9b7
Merge branch 'omprog' into nextmaster
...
Conflicts:
ChangeLog
runtime/rsyslog.h
2009-04-14 14:49:01 +02:00
Rainer Gerhards
b9b96fbfc6
removed MSG_NOSIGNAL & provided work-around
...
as this send() option is not supported on Solaris. We now
simply ignore SIGPIPE
2009-04-09 19:38:17 +02:00
Rainer Gerhards
7a2dff608d
Merge branch 'nextmaster' of git+ssh://rger@git.adiscon.com/git/rsyslog into nextmaster
2009-04-09 19:19:25 +02:00
Rainer Gerhards
9633ce1afc
fixed compile-time problems in im3195
...
... however, I did not not a test run due to the lack of
existing test drivers and the very low (aka "non-existing" interest
from the userbase in the feature).
2009-04-09 19:17:35 +02:00
Rainer Gerhards
e07b3f380f
working some more on "make distcheck"
...
... this time I think successfully (at least on Fedora...)
2009-04-09 18:51:21 +02:00
Rainer Gerhards
d2d8cc9c1b
fixed testbench compilation problem on Solaris
...
Solaris network libraries needed to be specified
in linker options
2009-04-09 14:45:23 +02:00
Rainer Gerhards
1e52abd8be
fixing "make distcheck"
2009-04-09 14:14:00 +02:00
Rainer Gerhards
cf0cf2fa4b
removed accidently added binary
2009-04-09 13:57:35 +02:00
Rainer Gerhards
5020884043
Merge branch 'nextmaster' into oracle
2009-04-09 13:56:08 +02:00
Luis Fernando Muñoz Mejías
1ebbd3a2df
Stop omoracle losing messages on rsyslog shutdown.
...
When rsyslog shuts down, we must send and commit any pending messages
or information will be lost. It will make rsyslog's shut down slower,
but also more reliable.
2009-04-09 13:55:06 +02:00
Luis Fernando Muñoz Mejías
9bbd5dfd25
Solve a memory leak when freeing Oracle instances.
2009-04-09 13:54:53 +02:00
Luis Fernando Muñoz Mejías
d7f11ecb06
Make it work in batches of statements.
...
Currently, all statements to be executed are stored on the same
structure. When the batch size is reached, all statements are executed
in a single transaction, and then committed.
There are many corner cases in which an error may happen and the batch
may be left in an inconsistent state, perhaps leaking memory or
crashing. They will be fixed.
2009-04-09 13:54:31 +02:00
Rainer Gerhards
4bd01053c5
Merge branch 'tcpflood' into nextmaster
...
Conflicts:
ChangeLog
2009-04-09 13:50:35 +02:00
Rainer Gerhards
9b34b305d8
Merge branch 'master' into nextmaster
...
Conflicts:
ChangeLog
2009-04-09 13:46:54 +02:00
Rainer Gerhards
a5b4cb1681
Merge branch 'beta'
...
Conflicts:
ChangeLog
tcpsrv.c
tcpsrv.h
Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
2009-04-09 13:44:52 +02:00
Rainer Gerhards
0cade5118f
Merge branch 'v3-stable' into beta
...
Conflicts:
ChangeLog
2009-04-09 13:41:38 +02:00
Rainer Gerhards
bc471f1d90
bugfix: $InputTCPMaxSessions config directive was accepted, but not honored
...
This resulted in a fixed upper limit of 200 connections.
2009-04-09 13:36:44 +02:00
Rainer Gerhards
5e4fc93dd5
Merge branch 'v2-stable' into v3-stable
2009-04-09 12:28:08 +02:00
Rainer Gerhards
a08ac7546f
bugfix: potential memory leak in msg.c
...
This one did not surface yet and the issue was actually found due to
a problem in v4 - but better fix it here, too.
2009-04-09 12:26:56 +02:00
Rainer Gerhards
aacb6dcbf4
Merge branch 'oracle' into nextmaster
2009-04-08 19:00:24 +02:00
Rainer Gerhards
1cfa08749b
bugfix: solved potential memory leak in msg processing
...
could manifest itself in imtcp (loss of a few bytes for *each* received
message - but depended on config) -- this was newly introduced
2009-04-08 18:59:15 +02:00
Rainer Gerhards
de38f744de
minor cleanup
2009-04-08 18:18:31 +02:00
Rainer Gerhards
7cc7166cb2
added new test case for many tcp connections
...
It is checked that many tcp connections are properly handled. While
adding this test, I noticed that there is a bug in imtcp that prevents
creation of more than 200 connections. This bug still exists, so the
test suite currently fails (what is correct). Will be addressed soon.
2009-04-08 17:48:02 +02:00
Rainer Gerhards
3fa5edb085
Merge branch 'nextmaster' into oracle
2009-04-08 12:30:24 +02:00
Rainer Gerhards
8f8e2cd66b
improved testbench, added tests for tcp-based reception
2009-04-08 12:19:54 +02:00
Rainer Gerhards
f7f0902f65
Merge branch 'nextmaster' into oracle
2009-04-07 15:28:06 +02:00
