mcardle 2005/12/29 13:33:39 CET
Modified files:
core/src/java/org/jahia/services/esi EsiInvalidation.java
Log:
* improved ESI server detailed string generation
Revision Changes Path
1.11 +28 -9
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.10&r2=1.11&f=h
Index: EsiInvalidation.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EsiInvalidation.java 22 Dec 2005 23:04:39 -0000 1.10
+++ EsiInvalidation.java 29 Dec 2005 12:33:39 -0000 1.11
@@ -438,7 +438,9 @@
catch (PatternSyntaxException ex) {
logger.error("[esi] : error in regex : " + ex);
}
- parseServerConfigString(EsiServerIPs, EsiServerPorts,
EsiServersDetails, "Esi Server");
+ EsiServersDetails = parseServerConfigString(EsiServerIPs,
EsiServerPorts, "Esi Server");
+ logger.info("[esi] : Configured Esi Server(s) : " +
EsiServersDetails );
+
try {
EsiInvalidationIPs = settings.getEsiInvalidationIPs().split(";");
@@ -447,10 +449,12 @@
catch (PatternSyntaxException ex) {
logger.error("[esi] : error in regex : " + ex);
}
- parseServerConfigString(EsiInvalidationIPs, EsiInvalidationPorts,
EsiInvalidationDetails, "Esi Invalidation Server");
+ EsiInvalidationDetails = parseServerConfigString(EsiInvalidationIPs,
EsiInvalidationPorts, "Esi Invalidation Server");
+ logger.info("[esi] : Configured Esi Invalidation Server(s) : " +
EsiInvalidationDetails );
+
}
- private static void parseServerConfigString(String[] IPs, String[]
Ports, String detailsString, String serverType) {
+ private static String parseServerConfigString(String[] IPs, String[]
Ports, String serverType) {
SettingsBean settings = Jahia.getSettings();
StringBuffer jahiaServersDetailsBuff = new StringBuffer();
@@ -459,20 +463,35 @@
&& IPs.length>=1 && Ports.length>=1) {
if (IPs.length != Ports.length) {
- logger.error("[esi] : The number of IP entries in
"+serverType+" entry "
- + "in the 'jahia.properties' file does not match the
number of Ports declared in ");
+ //Signal error but still try to go ahead
+ String errmsg = "[esi] : The number of IP entries in " +
serverType + " entry "
+ + "in the 'jahia.properties' file does not match the
number of Ports declared.";
+ logger.error(errmsg);
+ jahiaServersDetailsBuff.append(errmsg);
}
//cycle through each IP/Port combination declared
- //and create an invalidation entry for each combo:
-
+ //and create an information string for each:
+ jahiaServersDetailsBuff.append("[");
for (int i = 0; i < IPs.length; i++) {
String jahiaIP = IPs[i];
String jahiaPort = Ports[i];
- jahiaServersDetailsBuff.append(" - "+jahiaIP+":"+jahiaPort);
+ if (IPs.length>1) {
+ if (i!=0)
+ jahiaServersDetailsBuff.append(" - ");
+ jahiaServersDetailsBuff.append("Server #"+i+1+" :");
+ }
+ jahiaServersDetailsBuff.append(jahiaIP+":"+jahiaPort);
}
- detailsString =jahiaServersDetailsBuff.toString();
+ jahiaServersDetailsBuff.append("]");
+
+ return jahiaServersDetailsBuff.toString();
}
+
+ String errmsg = "[esi] : entries in " + serverType + " entry "
+ + "in the 'jahia.properties' file is invalid
or missing.";
+ logger.error(errmsg);
+ return errmsg;
}
}
