Rainer Gerhards
1531c541b2
Merge branch 'master' into perf
...
Conflicts:
ChangeLog
2008-09-30 11:25:34 +02:00
Rainer Gerhards
d03fb1b905
bumping version number (partial)
...
I am changing the way the version number is bumped so that
viewer git merge conflicts happen. In the future, it will
be bumped immediately before release and not immediately after
(though this means I need to be more careful with interim
versions).
2008-09-30 11:24:28 +02:00
Rainer Gerhards
4026000efc
Merge branch 'helgrind'
...
Conflicts:
ChangeLog
2008-09-30 10:58:39 +02:00
Rainer Gerhards
658130c083
some prep for 3.21.5 release
2008-09-30 10:54:39 +02:00
Rainer Gerhards
16970aad2e
Merge branch 'helgrind' into perf
2008-09-26 18:40:39 +02:00
Rainer Gerhards
92c2e09d19
some more threading cleanup
...
- removed newly-introduced potential deadlock in debug system
- removed unnecessary pthread_cond_signal
- a bit general cleanup
2008-09-26 18:40:28 +02:00
Rainer Gerhards
96f312f94f
Merge branch 'helgrind' into perf
...
Conflicts:
runtime/debug.c
2008-09-26 16:22:15 +02:00
Rainer Gerhards
b8e82d59b7
fixed potential race condition on HUP and termination
2008-09-26 16:10:05 +02:00
Rainer Gerhards
dc44f5a475
cleaned up internal debug system code and made it behave better in regard to multi-threading
2008-09-26 13:40:41 +02:00
Rainer Gerhards
47a2593ae4
atomic memory access calls re-enabled in msg.c
...
destructor not yet permitted because verification is
missing that a atomic opration is sufficient for the
job required
2008-09-23 14:41:02 +02:00
Rainer Gerhards
e9d7a3e6a5
minor: typo fix
2008-09-23 13:32:05 +02:00
Rainer Gerhards
c4b93886d0
Merge branch 'beta'
...
Conflicts:
doc/troubleshoot.html
2008-09-23 13:29:22 +02:00
Rainer Gerhards
75d8becf10
Merge branch 'v3-stable' into beta
2008-09-23 13:27:14 +02:00
Rainer Gerhards
765575e41f
added doc on malformed messages, cause and how to work-around, to the doc set
2008-09-23 13:26:57 +02:00
Rainer Gerhards
5b43ffdf1b
Merge branch 'master' into perf
2008-09-22 16:31:58 +02:00
Rainer Gerhards
bbf0f952a1
Merge branch 'master' into helgrind
2008-09-22 16:31:51 +02:00
Rainer Gerhards
4ee092935b
Merge branch 'beta'
2008-09-22 16:30:52 +02:00
Rainer Gerhards
80fe59ba00
Merge branch 'v3-stable' into beta
2008-09-22 16:30:42 +02:00
Rainer Gerhards
c66dbfd3f7
doc bugfix: $ActionExecOnlyWhenPreviousIsSuspended was still misspelled
...
... as $...OnlyIfPrev... in some parts of the documentation. Thanks to
Lorenzo M. Catucci for reporting this bug.
2008-09-22 16:25:26 +02:00
Rainer Gerhards
3a643aa747
Merge branch 'master' into perf
2008-09-22 15:50:31 +02:00
Rainer Gerhards
48555f70c7
Merge branch 'master' into helgrind
2008-09-22 15:50:22 +02:00
Rainer Gerhards
f0732cb75b
Merge branch 'beta'
2008-09-22 15:50:03 +02:00
Rainer Gerhards
1b2270ad3a
Merge branch 'v3-stable' into beta
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2008-09-22 15:49:54 +02:00
Rainer Gerhards
571c51fe34
bugfix: imudp input module could cause segfault on HUP
...
It did not properly de-init a variable acting as a linked list head.
That resulted in trying to access freed memory blocks after the HUP.
2008-09-22 15:47:58 +02:00
Rainer Gerhards
bc70a73019
bugfix: proper synchronization on message destruction
...
The code was potentially race, at least on systems where
a memory barrier was needed. Fix not fully tested yet.
2008-09-19 17:41:11 +02:00
Rainer Gerhards
5ce9b5ad83
TESTING COMMIT: commiting not fully correct code
...
... for the purpose of conducting a few external tests. This is a
first approach at removing the time() call in the output, but it shows
there are some subleties we need to address.
2008-09-18 17:17:47 +02:00
Rainer Gerhards
b005a1dcf8
added a small diag tool to generate local log messages quickly
...
... I think it may be useful to extend this later, thus I move it
into git.
2008-09-18 17:16:17 +02:00
Rainer Gerhards
9d8bb5629b
Merge branch 'helgrind' into perf
...
Conflicts:
ChangeLog
2008-09-18 12:45:44 +02:00
Rainer Gerhards
7b63cd6fed
minor things, mostly improved debug info
2008-09-18 12:44:00 +02:00
Rainer Gerhards
4c96ebdcfe
bugfix: potential race condition when adding messages to queue
...
There was a wrong order of mutex lock operations. It is hard to
believe that really caused problems, but in theory it could and with
threading we often see that theory becomes practice if something is only
used long enough on a fast enough machine with enough CPUs ;)
2008-09-18 12:19:33 +02:00
Rainer Gerhards
988989e49e
re-enabled gcc builtin atomic operations and added a proper ./configure check
2008-09-18 10:49:16 +02:00
Rainer Gerhards
cf8b0717e1
ignoring an (acceptable) race in debug system
2008-09-18 10:48:19 +02:00
Rainer Gerhards
65527ca625
bumped version number
2008-09-18 10:03:34 +02:00
Rainer Gerhards
41adeb2022
preparing for 3.18.4
2008-09-18 09:47:44 +02:00
Rainer Gerhards
ebc931db47
doc bugfix: queue doc had wrong parameter name
...
...for setting controlling worker thread shutdown period
2008-09-17 15:46:19 +02:00
Rainer Gerhards
bcb9765068
consolidated time() calls in rule engine
...
... but did not manage to avoid doing at least one call. So
this change introduced performance benefit only in a few
non-common situations. Anyhow, it hopefully levels ground
for better things to come.
2008-09-16 14:57:12 +02:00
Rainer Gerhards
19ac72a368
fixing previous patch, time() call was accidently left in
...
in one case, which was not on the focus of the initial testing
cases.
2008-09-16 13:12:50 +02:00
Rainer Gerhards
760e5f0d39
performance optimization: unnecessary time() calls during message parsing removed
...
thanks to David Lang for his excellent performance analysis
2008-09-16 11:56:07 +02:00
Rainer Gerhards
1e819a8afe
Merge branch 'beta'
...
Conflicts:
runtime/rsyslog.h
tools/syslogd.c
2008-09-12 15:17:47 +02:00
Rainer Gerhards
4e86efaf0e
fixed duplicate error number
...
This probably happened during a branch merge and was not detected.
Fixed now, should not haved any harm.
2008-09-12 15:15:28 +02:00
Rainer Gerhards
63994d092c
Merge branch 'v3-stable' into beta
...
Conflicts:
runtime/datetime.h
runtime/rsyslog.h
2008-09-12 15:11:38 +02:00
Rainer Gerhards
c04f196e25
Merge branch 'v2-stable' into v3-stable
...
Conflicts:
ChangeLog
syslogd.c
2008-09-12 14:53:17 +02:00
Rainer Gerhards
4bc99a5ead
bugfix: copy&paste error lead to dangling if
...
this caused a very minor issue with re-formatting a RFC3164 date when the
message was invalidly formatted and had a colon immediately after the date.
This was in the code for some years (even v1 had it) and I think it never
had any effect at all in practice. Though, it should be fixed - but definitely
nothing to worry about.
2008-09-12 14:46:16 +02:00
Rainer Gerhards
920cc1e164
bugfix: colon after date should be ignored, but was not.
...
This has now been corrected. Required change to the
internal ParseTIMESTAMP3164() interface.
2008-09-12 14:20:47 +02:00
Rainer Gerhards
262f61d869
added properties "inputname" and "$myhostname"
...
- added message property "inputname", which contains the name of the
input (module) that generated it. Presence is depending on suport in
each input module (else it is blank).
- added system property "$myhostname", which contains the name of the
local host as it knows itself.
2008-09-10 15:59:53 +02:00
Rainer Gerhards
1d97cb00bd
added doc for new property replacer feature
...
(see previous commit)
2008-09-10 12:29:44 +02:00
Zhuang Yuyao
d65470842d
added new capability to property replacer.
...
Multiple immediately successive field delimiters are treated as
a single one.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-09-10 12:18:34 +02:00
Marius Tomaschewski
7ad8addeb5
bugfix: option value for legacy -a option could not be specified
...
resulting in strange operations.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-09-10 11:53:34 +02:00
Rainer Gerhards
8cb83af111
bugfix: incorrect default discard severity could cause message loss
...
default discard severity was incorrectly set to 4, which lead
to discard-on-queue-full to be enabled by default. That could cause
message loss where non was expected. The default has now been changed
to the correct value of 8, which disables the functionality. This
problem applied both to the main message queue and the action queues.
Thanks to Raoul Bhatia for pointing out this problem.
2008-09-10 08:14:12 +02:00
Rainer Gerhards
702140afad
bugfix: error code -2025 was used for two different errors.
...
Queue full is now -2074 and -2025 is unique again.
(did cause no real problem
except for troubleshooting)
2008-09-04 14:18:42 +02:00
