You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/11/10 09:35:15 UTC
git commit: Updated haproxy config writer to use platform specific
new line character
Updated Branches:
refs/heads/master 7357ec7cf -> 00f53fad0
Updated haproxy config writer to use platform specific new line character
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/00f53fad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/00f53fad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/00f53fad
Branch: refs/heads/master
Commit: 00f53fad0f94e9d9927df4517798c4d8d6947eb9
Parents: 7357ec7
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Nov 10 14:04:52 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Nov 10 14:04:52 2013 +0530
----------------------------------------------------------------------
.../stratos/haproxy/extension/HAProxy.java | 1 -
.../haproxy/extension/HAProxyConfigWriter.java | 23 +++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/00f53fad/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxy.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxy.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxy.java
index f408a13..cdb8bd3 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxy.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxy.java
@@ -40,7 +40,6 @@ public class HAProxy implements LoadBalancer {
private String executableFilePath;
private String processIdFilePath;
-
private String templatePath;
private String templateName;
private String confFilePath;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/00f53fad/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyConfigWriter.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyConfigWriter.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyConfigWriter.java
index 0be362c..c6c8c56 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyConfigWriter.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyConfigWriter.java
@@ -42,6 +42,7 @@ import java.io.StringWriter;
*/
public class HAProxyConfigWriter {
private static final Log log = LogFactory.getLog(Main.class);
+ private static final String NEW_LINE = System.getProperty("line.separator");
private String templatePath;
private String templateName;
@@ -64,22 +65,22 @@ public class HAProxyConfigWriter {
String frontEndId = cluster.getClusterId() + "-proxy-" + port.getProxy();
String backEndId = frontEndId + "-members";
- sb.append("frontend ").append(frontEndId).append("\n");
- sb.append("\tbind ").append(cluster.getHostName()).append(":").append(port.getProxy()).append("\n");
- sb.append("\tdefault_backend ").append(backEndId).append("\n");
- sb.append("\n");
- sb.append("backend ").append(backEndId).append("\n");
+ sb.append("frontend ").append(frontEndId).append(NEW_LINE);
+ sb.append("\tbind ").append(cluster.getHostName()).append(":").append(port.getProxy()).append(NEW_LINE);
+ sb.append("\tdefault_backend ").append(backEndId).append(NEW_LINE);
+ sb.append(NEW_LINE);
+ sb.append("backend ").append(backEndId).append(NEW_LINE);
for (Member member : cluster.getMembers()) {
sb.append("\tserver ").append(member.getMemberId()).append(" ")
- .append(member.getMemberIp()).append(":").append(port.getValue()).append("\n");
+ .append(member.getMemberIp()).append(":").append(port.getValue()).append(NEW_LINE);
}
- sb.append("\n");
+ sb.append(NEW_LINE);
}
}
}
- // Start the VelocityEngine
+ // Start velocity engine
VelocityEngine ve = new VelocityEngine();
ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, templatePath);
ve.init();
@@ -87,7 +88,7 @@ public class HAProxyConfigWriter {
// Open the template
Template t = ve.getTemplate(templateName);
- // Insert the strings into the template
+ // Insert strings into the template
VelocityContext context = new VelocityContext();
context.put("frontend_backend_collection", sb.toString());
@@ -102,7 +103,9 @@ public class HAProxyConfigWriter {
writer.write(configuration);
writer.close();
- log.info("wrote configuration to file");
+ if(log.isInfoEnabled()) {
+ log.info(String.format("Configuration written to file: %s", confFilePath));
+ }
} catch (IOException e) {
if(log.isErrorEnabled()) {
log.error("Could not write configuration file", e);