summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2012-07-11 03:08:32 -0700
committerAndre Lorbach <alorbach@adiscon.com>2012-07-11 03:08:32 -0700
commitafe402d2418d181a1fd5f469ec4c4cf5c394d8c5 (patch)
treee9e168b4e3c046cedd7bf56b194f5d383d979d53
parent68056a6128b9ebc8d65791b2647030d36c73f014 (diff)
downloadrsyslog-afe402d2418d181a1fd5f469ec4c4cf5c394d8c5.tar.gz
rsyslog-afe402d2418d181a1fd5f469ec4c4cf5c394d8c5.tar.xz
rsyslog-afe402d2418d181a1fd5f469ec4c4cf5c394d8c5.zip
bugfix: imtcp aborted when more than 2 connections were used.
Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
-rw-r--r--ChangeLog3
-rw-r--r--plugins/imptcp/imptcp.c2
-rw-r--r--plugins/imttcp/imttcp.c2
-rw-r--r--tcpsrv.c2
4 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6219f04b..34dec2d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
---------------------------------------------------------------------------
Version 6.3.13 [BETA] 2012-07-??
- omelasticsearch: support for parameters parent & dynparent added
+- bugfix: imtcp aborted when more than 2 connections were used.
+ Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
---------------------------------------------------------------------------
Version 6.3.12 [BETA] 2012-07-02
- support for elasticsearch via omelasticsearch added
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index 6961a696..b63e7ca3 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -1587,7 +1587,7 @@ CODEmodInit_QueryRegCFSLineHdlr
/* initialize "read-only" thread attributes */
pthread_attr_init(&wrkrThrdAttr);
- pthread_attr_setstacksize(&wrkrThrdAttr, 2048*1024);
+ pthread_attr_setstacksize(&wrkrThrdAttr, 4096*1024);
/* init legacy config settings */
initConfigSettings();
diff --git a/plugins/imttcp/imttcp.c b/plugins/imttcp/imttcp.c
index 5ed714fa..c72886b3 100644
--- a/plugins/imttcp/imttcp.c
+++ b/plugins/imttcp/imttcp.c
@@ -1127,7 +1127,7 @@ CODEmodInit_QueryRegCFSLineHdlr
/* initialize "read-only" thread attributes */
pthread_attr_init(&sessThrdAttr);
pthread_attr_setdetachstate(&sessThrdAttr, PTHREAD_CREATE_DETACHED);
- pthread_attr_setstacksize(&sessThrdAttr, 200*1024);
+ pthread_attr_setstacksize(&sessThrdAttr, 4096*1024);
/* register config file handlers */
CHKiRet(omsdRegCFSLineHdlr(UCHAR_CONSTANT("inputttcpserverrun"), 0, eCmdHdlrGetWord,
diff --git a/tcpsrv.c b/tcpsrv.c
index 0e6e13d2..e5fe0d71 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -1335,7 +1335,7 @@ startWorkerPool(void)
wrkrRunning = 0;
pthread_cond_init(&wrkrIdle, NULL);
pthread_attr_init(&sessThrdAttr);
- pthread_attr_setstacksize(&sessThrdAttr, 200*1024);
+ pthread_attr_setstacksize(&sessThrdAttr, 4096*1024);
for(i = 0 ; i < wrkrMax ; ++i) {
/* init worker info structure! */
pthread_cond_init(&wrkrInfo[i].run, NULL);