289 Commits

Author SHA1 Message Date
Rainer Gerhards
935a9eef57 added tcp output rebinding option.
added tcp output rebinding option.

needs some more testing and doc
2009-07-14 19:45:26 +02:00
Rainer Gerhards
9e81945a64 Merge branch 'v4-beta' into v4-devel 2009-07-14 15:28:58 +02:00
Rainer Gerhards
7eadb67d19 bugfix: fromhost-ip was sometimes truncated 2009-07-14 15:27:00 +02:00
Rainer Gerhards
fec2041e03 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-07-13 15:55:46 +02:00
Rainer Gerhards
ddd427cf5c Merge branch 'v4-beta' into v4-devel 2009-07-13 15:52:59 +02:00
Rainer Gerhards
47ca77faca Merge branch 'v3-stable' into v4-beta
Conflicts:
	ChangeLog
2009-07-13 15:52:45 +02:00
Rainer Gerhards
ef9722ec87 fix compile error in zip sender patch
... at least I was smart enough to remind me that I did not do
one test ;) That reminder was the compiler error. Now removed and
test done ;) [simple things tend to work, lol]
2009-07-13 15:44:09 +02:00
Rainer Gerhards
89e18de662 bugfix: sending syslog messages with zip compression did not work 2009-07-13 14:24:16 +02:00
Rainer Gerhards
ab40107149 Merge branch 'v4-beta' into v4-devel
Conflicts:
	tests/nettester.c
2009-07-09 16:35:13 +02:00
Rainer Gerhards
92020c6ea1 bugfix: omfwd segfault when debugging is turned on 2009-07-09 12:34:48 +02:00
Rainer Gerhards
e3040285db first shot at asynchronous stream writer with timeout capability
... seems to work on quick testing, but needs a far more testing
and improvement. Good milestone commit.
2009-07-06 16:38:09 +02:00
Rainer Gerhards
b37a1eb0f8 omfile itself no longer needs zlib 2009-07-02 17:06:00 +02:00
Rainer Gerhards
7bfa03bdc0 now put the new property-based methods to good use
... hopefully reducing the number of allocs/frees as well as overall
memory usage in a busy system (plus that these shared properties hopefully
remain in cache longer than its single-instance counterparts...)
2009-07-01 14:33:19 +02:00
Rainer Gerhards
d6faee67b4 RcvFromIP now also a property
This sets stage to enable use of the property-interface to speed
up things (mildly), the next step to be done. I have also fixed one
regression of yesterday's changes.
2009-07-01 13:28:17 +02:00
Rainer Gerhards
aaffc4281e introduced a new way of handling the RcvFrom property
... plus a fix for a long-time bug in obj-types.h. That lead to
the object pointer only then to become NULL when the object was
actually destructed, I discovered this issue during
introduction of the pRcvFrom property in msg_t, but it potentially had other
effects, too. I am not sure if some experienced instability resulted from this
bug OR if its fix will cause harm to so-far "correctly" running code. The later
may very well be. Thus I will change it only for the current branch and also
the beta, but not in all old builds. Let's see how things evolve.
2009-06-30 18:45:41 +02:00
Rainer Gerhards
e397c34d2a finished transition to using inputName property
... plus some celanup and adding minor missing functionality
(the rule debug info again tell the property name, not just number).
2009-06-30 15:21:15 +02:00
Rainer Gerhards
de84a12f8a introduced the idea of detached properties
some things inside the message can be used over a large number of
messages and need to to be allocated and re-written every time. I now
begin to implement this as a "prop_t" object, first use for the inputName.
Some input modules are already converted, some others to go. Will do
a little performance check on the new method before I go further.

Also, this commit has some cleanup and a few bug fixes that prevented
compiliation in debug mode (I overlooked this as I did not compile
for debug, what I normally do, and the automatted test also does not
do that)
2009-06-29 16:53:26 +02:00
Rainer Gerhards
151c22e579 Merge branch 'beta' into master
Conflicts:
	tools/syslogd.c
2009-06-29 12:47:43 +02:00
Rainer Gerhards
8515376ac9 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
2009-06-29 12:46:00 +02:00
Rainer Gerhards
6511278082 bugfix: ssh session hangs after rsyslgod is started from it
stderr/stdout were not closed to be able to emit error messages,
but this caused ssh sessions to hang. Now we close them after the
initial initialization. See forum thread:
http://kb.monitorware.com/controlling-terminal-issues-t9875.html
2009-06-29 12:40:41 +02:00
Rainer Gerhards
6a29afc83f some cleanup 2009-06-29 11:26:18 +02:00
Michael Terry
e747478051 separate willRun and runInput calls for input modules
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-06-29 11:18:55 +02:00
Michael Terry
ba4806a704 add support for KLogPath 2009-06-29 10:58:38 +02:00
Rainer Gerhards
1f79c78597 named queue worker threads
... but I don't see the name anywhere...?
2009-06-25 16:03:28 +02:00
Rainer Gerhards
5af5b1e428 improvements/fixes in queue termination timeout handling
- bugfix: subtle (and usually irrelevant) issue in timout processing
  timeout could be one second too early if nanoseconds wrapped
- set a more sensible timeout for shutdow, now 1.5 seconds to complete
  processing (this also removes those cases where the shutdown message
  was not written because the termination happened before it)
2009-06-25 12:59:13 +02:00
Rainer Gerhards
8eb10a7105 Merge branch 'omfile'
Conflicts:
	ChangeLog
2009-06-24 10:52:06 +02:00
Rainer Gerhards
2533c07a70 Merge branch 'v4-stable' into beta 2009-06-24 10:15:07 +02:00
Rainer Gerhards
11cda87ede Merge branch 'v3-stable' into v4-stable 2009-06-24 10:14:56 +02:00
Michael Biebl
71c57cfa12 minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-06-24 10:14:23 +02:00
Rainer Gerhards
b2fa740b9a optimized TAG handling 2009-06-23 17:14:42 +02:00
Rainer Gerhards
662ad3e4bf optimized hostname processing 2009-06-23 16:32:29 +02:00
Rainer Gerhards
86e37f70fe more strict parsing of the hostname in rfc3164 mode
... hopefully removes false positives (but may cause some trouble
with hostname parsing). For details, see this bug tracker:

  http://bugzilla.adiscon.com/show_bug.cgi?id=126

This patch is not optimal for v4 - another one will follow. The spirit
of this commit is to enable easier backporting if someone is interested
in doing so.
2009-06-23 16:14:19 +02:00
Rainer Gerhards
b1f2e53921 prevented unneccessary apc calls 2009-06-23 15:17:55 +02:00
Rainer Gerhards
b50d13a6a9 restored repeated message reduction processing 2009-06-23 14:50:03 +02:00
Rainer Gerhards
ce5869f7c4 optimized processing of TAG message field 2009-06-22 18:52:30 +02:00
Rainer Gerhards
953d015f44 switched default to keep in line with traditional syslogd behaviour 2009-06-19 14:25:27 +02:00
Rainer Gerhards
7a695d1714 removed uniprocessor optimization
... as it was not even optimal on uniprocessors any longer ;) I keep
the config directive in, maybe we can utilize it again at some later
point in time (questionable).
2009-06-19 12:03:56 +02:00
Rainer Gerhards
2de4964aff optimized handling of MSG part in msg object
WARNING: currently, message repeation processing is disabled, must
be reenabled (but prefer to do some other tests first)
2009-06-18 16:51:40 +02:00
Rainer Gerhards
2f86678c57 optimized TAG handling in msg object 2009-06-18 14:30:21 +02:00
Rainer Gerhards
8628312396 cleaned up/optimized raw message handling in msg object 2009-06-18 13:22:21 +02:00
Rainer Gerhards
f529e8b2c3 Merge branch 'master' into newmsg
Conflicts:
	tools/omfile.c
2009-06-18 11:14:14 +02:00
Rainer Gerhards
a6ed4b59cc Merge branch 'beta' 2009-06-18 11:11:59 +02:00
Rainer Gerhards
17133f2cd1 Merge branch 'v3-stable' into beta 2009-06-18 11:11:07 +02:00
Rainer Gerhards
bca66bc139 some minor bugfixes
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
  set of files (e.g. *.conf, where none such files existed)
  thanks to Michael Biebl for reporting this bug
- bugfix: when run in foreground (but not in debug mode), a
  debug message ("DoDie called") was emitted at shutdown. Removed.
  thanks to Michael Biebl for reporting this bug
- bugfix: some garbagge was emitted to stderr on shutdown. This
  garbage consisted of file names, which were written during
  startup (key point: not a pointer error)
  thanks to Michael Biebl for reporting this bug
- bugfix: startup and shutdown message were emitted to stdout
  thanks to Michael Biebl for reporting this bug
2009-06-18 11:10:28 +02:00
Rainer Gerhards
d2d54013ae going forward in moving string-handling functions to new interface... 2009-06-17 15:22:13 +02:00
Rainer Gerhards
56e462610d further optimized message object
pri, facility and severity string generation simplified
2009-06-17 12:56:58 +02:00
Rainer Gerhards
c4e18c5bab implemented first version of multi-enqueue support, queue side 2009-06-16 15:43:22 +02:00
Rainer Gerhards
6f0db63e9b milestone: input-side multiSubmit capability
... commit before I try to touch the queue side ;)
2009-06-16 15:13:47 +02:00
Rainer Gerhards
aef1a38fe8 fixing problems that occurred during the last merge 2009-06-16 13:28:18 +02:00
Rainer Gerhards
98348ae03d Merge branch 'master' into omfile
Conflicts:
	ChangeLog
	runtime/msg.h
	tcps_sess.c
	tcpsrv.c
	tools/syslogd.c
2009-06-16 12:59:55 +02:00