Author: mcardle
Date: Thu Aug 17 07:09:28 2006
New Revision: 310
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=310&repname=esi_server
Log:
* cache/off fix
Modified:
trunk/WEB-INF/config/data.xml
trunk/src/org/jahia/esi/FetcherTask.java
Modified: trunk/WEB-INF/config/data.xml
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/WEB-INF/config/data.xml&rev=310&repname=esi_server
==============================================================================
--- trunk/WEB-INF/config/data.xml (original)
+++ trunk/WEB-INF/config/data.xml Thu Aug 17 07:09:28 2006
@@ -244,9 +244,9 @@
the passthrough-rule: POSTS, Ajax ) from all the remote servers. (Set
to '-1' for unlimited threads) -->
<maxPassThroughFetchers>40</maxPassThroughFetchers>
<!-- defines the maximum number of simultaenous HTTP connections to
any given host.-->
- <maxHttpConnectionsPerHost>60</maxHttpConnectionsPerHost>
+ <maxHttpConnectionsPerHost>80</maxHttpConnectionsPerHost>
<!-- defines the total maximum number of simultaenous HTTP connections
across all hosts -->
- <maxTotalHttpConnections>120</maxTotalHttpConnections>
+ <maxTotalHttpConnections>160</maxTotalHttpConnections>
<!-- During heavy loads or remote server timeouts, the ESI server will
return a default page with a Meta Refresh Tag
in it so that the browser will try again the request at a later time.
This frees up resources on the ESI server to finish the other queued
tasks.
Modified: trunk/src/org/jahia/esi/FetcherTask.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/src/org/jahia/esi/FetcherTask.java&rev=310&repname=esi_server
==============================================================================
--- trunk/src/org/jahia/esi/FetcherTask.java (original)
+++ trunk/src/org/jahia/esi/FetcherTask.java Thu Aug 17 07:09:28 2006
@@ -940,7 +940,7 @@
true, //currently inUse
!fetchingSkeleton,
userName,
- Utils.removeCacheParamInUrl(_requestInfoKey,
isCacheOffOnce)
+
(_requestInfoKey!=null)?Utils.removeCacheParamInUrl(_requestInfoKey,
isCacheOffOnce):null
);
}
//for "/cache/bypass" we just don't store it (by setting
expiration to 0)
@@ -1202,7 +1202,7 @@
detectedConnectionResetByPeer = true;
}
else
- log.error(id + " - error closing outputstream to
client Response : "+urlToServer,ex);
+ log.error(id + " - error closing outputstream to
client Response : "+urlToServer+" Exception:"+ex);
}
try {
