mcardle 2005/12/29 14:50:30 CET
Modified files:
core/src/java/org/jahia/services/esi EsiInvalidation.java
Log:
* adds support for , and ; seperators and white-spaces in jahia.properties
esiInvalidationPorts/IPs and esiServerPorts/IPs declarations
Revision Changes Path
1.12 +34 -12
jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java.diff?r1=1.11&r2=1.12&f=h
Index: EsiInvalidation.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EsiInvalidation.java 29 Dec 2005 12:33:39 -0000 1.11
+++ EsiInvalidation.java 29 Dec 2005 13:50:30 -0000 1.12
@@ -432,8 +432,18 @@
public static void initJahiaServerAddresses() {
SettingsBean settings = Jahia.getSettings();
try {
- EsiServerIPs = settings.getEsiServerIPs().split(";");
- EsiServerPorts = settings.getEsiServerPorts().split(";");
+ //support both , and ; seperators
+ if (settings.getEsiServerIPs().indexOf(";")!=-1) {
+ EsiServerIPs = settings.getEsiServerIPs().trim().split(";");
+ } else {
+ EsiServerIPs = settings.getEsiServerIPs().trim().split(",");
+ }
+
+ if (settings.getEsiServerPorts().indexOf(";")!=-1) {
+ EsiServerPorts =
settings.getEsiServerPorts().trim().split(";");
+ } else {
+ EsiServerPorts =
settings.getEsiServerPorts().trim().split(",");
+ }
}
catch (PatternSyntaxException ex) {
logger.error("[esi] : error in regex : " + ex);
@@ -443,18 +453,28 @@
try {
- EsiInvalidationIPs = settings.getEsiInvalidationIPs().split(";");
- EsiInvalidationPorts =
settings.getEsiInvalidationPorts().split(";");
+ //support both , and ; seperators
+ if (settings.getEsiInvalidationIPs().indexOf(";")!=-1) {
+ EsiInvalidationIPs =
settings.getEsiInvalidationIPs().trim().split(";");
+ } else {
+ EsiInvalidationIPs =
settings.getEsiInvalidationIPs().trim().split(",");
+ }
+ if (settings.getEsiInvalidationPorts().indexOf(";")!=-1) {
+ EsiInvalidationPorts =
settings.getEsiInvalidationPorts().trim().split(";");
+ } else {
+ EsiInvalidationPorts =
settings.getEsiInvalidationPorts().trim().split(",");
+ }
+
}
catch (PatternSyntaxException ex) {
logger.error("[esi] : error in regex : " + ex);
}
- EsiInvalidationDetails = parseServerConfigString(EsiInvalidationIPs,
EsiInvalidationPorts, "Esi Invalidation Server");
- logger.info("[esi] : Configured Esi Invalidation Server(s) : " +
EsiInvalidationDetails );
+ EsiInvalidationDetails =
parseServerConfigString(EsiInvalidationIPs, EsiInvalidationPorts, "Esi
Invalidation Server");
+ logger.info("[esi] : Configured Esi Invalidation Server(s) : "
+ EsiInvalidationDetails );
- }
+ }
- private static String parseServerConfigString(String[] IPs, String[]
Ports, String serverType) {
+ private static String parseServerConfigString(String[] IPs,
String[] Ports, String serverType) {
SettingsBean settings = Jahia.getSettings();
StringBuffer jahiaServersDetailsBuff = new StringBuffer();
@@ -473,13 +493,15 @@
//and create an information string for each:
jahiaServersDetailsBuff.append("[");
for (int i = 0; i < IPs.length; i++) {
+ IPs[i] = IPs[i].trim();
String jahiaIP = IPs[i];
+ Ports[i] = Ports[i].trim();
String jahiaPort = Ports[i];
if (IPs.length>1) {
if (i!=0)
- jahiaServersDetailsBuff.append(" - ");
- jahiaServersDetailsBuff.append("Server #"+i+1+" :");
+ jahiaServersDetailsBuff.append(" - ");
+ jahiaServersDetailsBuff.append("Server
#"+Integer.toString((i+1))+" :");
}
jahiaServersDetailsBuff.append(jahiaIP+":"+jahiaPort);
}
@@ -489,11 +511,11 @@
}
String errmsg = "[esi] : entries in " + serverType + " entry "
- + "in the 'jahia.properties' file is invalid
or missing.";
+ + "in the 'jahia.properties' file is invalid or missing.";
logger.error(errmsg);
return errmsg;
}
-}
+ }
