mcardle 2005/12/30 13:08:17 CET
Modified files:
WEB-INF/config data.xml
src/net/sf/j2ep ConfigParser.java ProxyFilter.java
src/org/jahia/esi/invalidation Server.java
src/org/jahia/esi/settings SettingsBean.java
Log:
* adds configurable maxConnections for invalidation message reception
Revision Changes Path
1.11 +1 -0 esi_server/WEB-INF/config/data.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/WEB-INF/config/data.xml.diff?r1=1.10&r2=1.11&f=h
1.11 +1 -1 esi_server/src/net/sf/j2ep/ConfigParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/net/sf/j2ep/ConfigParser.java.diff?r1=1.10&r2=1.11&f=h
1.15 +2 -2 esi_server/src/net/sf/j2ep/ProxyFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/net/sf/j2ep/ProxyFilter.java.diff?r1=1.14&r2=1.15&f=h
1.6 +1 -1 esi_server/src/org/jahia/esi/invalidation/Server.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/invalidation/Server.java.diff?r1=1.5&r2=1.6&f=h
1.3 +10 -0 esi_server/src/org/jahia/esi/settings/SettingsBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/settings/SettingsBean.java.diff?r1=1.2&r2=1.3&f=h
Index: data.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/WEB-INF/config/data.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- data.xml 29 Dec 2005 02:31:09 -0000 1.10
+++ data.xml 30 Dec 2005 12:08:16 -0000 1.11
@@ -4,6 +4,7 @@
<invalidationPort>6666</invalidationPort>
<invalidationPortRange>6766-6866</invalidationPortRange>
+ <invalidationMaxConnections>20</invalidationMaxConnections>
<activateInvalidationServer>true</activateInvalidationServer>
<enableCacheBypassUrlParam>true</enableCacheBypassUrlParam>
Index: ConfigParser.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/net/sf/j2ep/ConfigParser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConfigParser.java 29 Dec 2005 02:31:10 -0000 1.10
+++ ConfigParser.java 30 Dec 2005 12:08:16 -0000 1.11
@@ -109,7 +109,7 @@
digester.addBeanPropertySetter(
"config/generalsettings/defaultExpirationDelayInSecs", "defaultExpiration" );
digester.addBeanPropertySetter(
"config/generalsettings/defaultMaxRemovalDelayInSecs", "defaultMaxRemovalDelay"
);
digester.addBeanPropertySetter(
"config/generalsettings/invalidationPortRange", "invalidationPortRange" );
-
+ digester.addBeanPropertySetter(
"config/generalsettings/invalidationMaxConnections",
"invalidationMaxConnections" );
SettingsBean settingsBean = (SettingsBean) digester.parse(data);
SettingsBean.setInstance(settingsBean);
Index: ProxyFilter.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/net/sf/j2ep/ProxyFilter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ProxyFilter.java 14 Dec 2005 16:57:06 -0000 1.14
+++ ProxyFilter.java 30 Dec 2005 12:08:16 -0000 1.15
@@ -276,9 +276,9 @@
if (SettingsBean.getInstance().isActivateInvalidationServer()) {
- // Create a server object that has a limit of 5 concurrent
+ // Create a server object that has a limit of xx concurrent
// connections
- invalidationServer = new org.jahia.esi.invalidation.Server(5);
+ invalidationServer = new
org.jahia.esi.invalidation.Server(SettingsBean.getInstance().getInvalidationMaxConnections());
invalidatorService = new Invalidator(invalidationServer);
try {
invalidationServer.addService(invalidatorService,
SettingsBean.getInstance().getInvalidationPort());
Index: Server.java
===================================================================
RCS file:
/home/cvs/repository/esi_server/src/org/jahia/esi/invalidation/Server.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Server.java 29 Dec 2005 02:31:11 -0000 1.5
+++ Server.java 30 Dec 2005 12:08:16 -0000 1.6
@@ -76,7 +76,7 @@
this.maxConnections = maxConnections;
services = new HashMap( );
connections = new HashSet(maxConnections);
- log.info("Starting server");
+ log.info("Starting Invalidation server with "+maxConnections+"
maxConnections");
}
/**
Index: SettingsBean.java
===================================================================
RCS file:
/home/cvs/repository/esi_server/src/org/jahia/esi/settings/SettingsBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SettingsBean.java 29 Dec 2005 02:31:11 -0000 1.2
+++ SettingsBean.java 30 Dec 2005 12:08:16 -0000 1.3
@@ -78,6 +78,7 @@
private String username;
private String password;
+ private int invalidationMaxConnections;
private int defaultExpiration;
private int defaultMaxRemovalDelay;
@@ -151,6 +152,14 @@
//TODO: add these to data.xml -----------------------------------------
//TODO: ***************************** END - Dummy Functions
*********************************
+ public int getInvalidationMaxConnections() {
+ return invalidationMaxConnections;
+ }
+
+ public void setInvalidationMaxConnections(int
invalidationMaxConnections) {
+ this.invalidationMaxConnections = invalidationMaxConnections;
+ }
+
public String getInvalidationPortRange() {
return invalidationPortRange;
}
@@ -304,6 +313,7 @@
"invalidationPort=" + invalidationPort + "\n" +
", invalidationPortRange='" + invalidationPortRange + "'" +
"\n" +
", activateInvalidationServer=" + activateInvalidationServer
+ "\n" +
+ ", invalidationMaxConnections=" + invalidationMaxConnections
+ "\n" +
", enableCacheBypass=" + enableCacheBypass + "\n" +
", enableCacheOff=" + enableCacheOff + "\n" +
", enableCacheOffOnce=" + enableCacheOffOnce + "\n" +
