summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-05-13 11:02:16 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-05-13 11:02:16 +0200
commit0ffbe44d44aa25134a8cc462ed0406e87f02b783 (patch)
tree58610154db2fa7333811a3ca1c3d4a22a12d0213
parent45385a5839c182e6898aac5936667f31e2bbd6f3 (diff)
downloadrsyslog-0ffbe44d44aa25134a8cc462ed0406e87f02b783.tar.gz
rsyslog-0ffbe44d44aa25134a8cc462ed0406e87f02b783.tar.bz2
rsyslog-0ffbe44d44aa25134a8cc462ed0406e87f02b783.zip
bugfix: omrelp legacy config parameters set a timeout of zero
which lead the legacy config to be unusable.
-rw-r--r--ChangeLog2
-rw-r--r--plugins/omrelp/omrelp.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cb5ec104..466ff623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 7.3.15 [beta] 2013-05-0?
+- bugfix: omrelp legacy config parameters set a timeout of zero
+ which lead the legacy config to be unusable.
- bugfix: segfault on startup if a disk queue was configure without file
name
Now this triggers an error message and the queue is changed to
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index c9e32444..fa5607a7 100644
--- a/plugins/omrelp/omrelp.c
+++ b/plugins/omrelp/omrelp.c
@@ -121,6 +121,7 @@ finalize_it:
BEGINcreateInstance
CODESTARTcreateInstance
pData->bInitialConnect = 1;
+ pData->timeout = 90;
ENDcreateInstance
BEGINfreeInstance