Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv1090
Modified Files:
ChangeLog NEWS control.c indCIMXMLExport.c sfcb.cfg.pre.in
Log Message:
[ 3531210 ] Allow indication delivery timeout tuning
Index: indCIMXMLExport.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLExport.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- indCIMXMLExport.c 7 Jun 2012 01:02:14 -0000 1.18
+++ indCIMXMLExport.c 7 Jun 2012 02:56:09 -0000 1.19
@@ -25,6 +25,7 @@
#include "utilft.h"
#include "trace.h"
#include <string.h>
+#include "control.h"
extern UtilStringBuffer *newStringBuffer(int);
extern int getControlChars(char *id, char **val);
@@ -185,8 +186,11 @@
return 3;
}
- /* Set transfer timeout to 10 sec */
- rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, 10);
+ /* Set transfer timeout to config option or 10 sec */
+ long indicationCurlTimeout=10;
+ if (getControlNum("indicationCurlTimeout", &indicationCurlTimeout))
+ indicationCurlTimeout = 10;
+ rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, indicationCurlTimeout);
/* Set username and password * /
if (url.user.length() > 0 && url.password.length() > 0) {
Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- control.c 19 Apr 2012 17:39:55 -0000 1.46
+++ control.c 7 Jun 2012 02:56:09 -0000 1.47
@@ -135,6 +135,7 @@
{"indicationDeliveryThreadTimeout",1,"0"},
{"MaxListenerDestinations",1,"100"},
{"MaxActiveSubscriptions",1,"100"},
+ {"indicationCurlTimeout",1,"10"},
};
void sunsetControl()
Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- sfcb.cfg.pre.in 19 Apr 2012 17:39:55 -0000 1.34
+++ sfcb.cfg.pre.in 7 Jun 2012 02:56:09 -0000 1.35
@@ -278,6 +278,11 @@
## Default is 0 (no timeout)
#indicationDeliveryThreadTimeout: 0
+## Timeout passed to curl for thread delivery. After this time has elapsed
+## the indication delivery is considered a failure.
+## Default is 10 seconds
+#indicationCurlTimeout: 10
+
##----------------------------Reliable Indications ----------------------------
## Interval between indication retry attempts
## Default is 20 seconds
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -d -r1.774 -r1.775
--- ChangeLog 7 Jun 2012 01:02:14 -0000 1.774
+++ ChangeLog 7 Jun 2012 02:56:09 -0000 1.775
@@ -1,5 +1,10 @@
2012-06-06 Michael Chase-Salerno <br...@li...>
+ * control.h, indCIMXMLExport.c, sfcb.cfg.pre.in:
+ [ 3531210 ] Allow indication delivery timeout tuning
+
+2012-06-06 Michael Chase-Salerno <br...@li...>
+
* indCIMXMLExport.c:
[ 3527920 ] RI and http response codes
Fix for curl errors not being caught
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -d -r1.692 -r1.693
--- NEWS 30 May 2012 21:26:33 -0000 1.692
+++ NEWS 7 Jun 2012 02:56:09 -0000 1.693
@@ -8,6 +8,7 @@
- 3517530 Implement mark, release routines in CMPIBrokerMemFT
- 3513390 Enforce LD and subscription limits
- 3527920 RI and http responsecodes
+- 3531210 Allow indication delivery timeout tuning
Bugs fixed:
|
