From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 29 Feb 2012 16:32:23 +0000 (+0000)
Subject: Using timeouts (L&B server may be keep connection when waiting for MySQL database).
X-Git-Tag: gridsite-core_R_1_7_18~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e93554d93b995b8cd4c68881b4ef0b5c46bc3ce2;p=jra1mw.git

Using timeouts (L&B server may be keep connection when waiting for MySQL database).
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
index 236041c..5beb501 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
@@ -110,10 +110,10 @@ X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\
 printf "Using SSL client: "
 $SYS_CURL --version | head -n 1 | grep -i NSS/ >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-	SSL_CMD="wget --no-check-certificate --secure-protocol=SSLv3 --quiet --private-key $X509_USER_PROXY --certificate $X509_USER_PROXY --ca-directory /etc/grid-security/certificates --ca-certificate $X509_USER_PROXY --output-document https.$$.tmp"
+	SSL_CMD="wget --timeout=60 --no-check-certificate --secure-protocol=SSLv3 --quiet --private-key $X509_USER_PROXY --certificate $X509_USER_PROXY --ca-directory /etc/grid-security/certificates --ca-certificate $X509_USER_PROXY --output-document https.$$.tmp"
 	SSL_CLIENT=wget
 else
-	SSL_CMD="$SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp"
+	SSL_CMD="$SYS_CURL --max-time 60 --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output https.$$.tmp"
 	SSL_CLIENT=curl
 fi
 printf "$SSL_CLIENT"