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/17 06:20:05 UTC
git commit: Removed unused variable processIdFilePath in
HAProxyContext, fixed concatenated string in CommandUtil, fixed spelling
Updated Branches:
refs/heads/master 5d8ab42f9 -> 94d8f915d
Removed unused variable processIdFilePath in HAProxyContext, fixed concatenated string in CommandUtil, fixed spelling
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/94d8f915
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/94d8f915
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/94d8f915
Branch: refs/heads/master
Commit: 94d8f915d4bf9c90739aeafc2621d593f9a54b24
Parents: 5d8ab42
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Nov 17 10:49:42 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Nov 17 10:49:42 2013 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/haproxy/extension/CommandUtil.java | 4 ++--
.../main/java/org/apache/stratos/haproxy/extension/HAProxy.java | 2 +-
.../org/apache/stratos/haproxy/extension/HAProxyContext.java | 5 -----
.../main/java/org/apache/stratos/haproxy/extension/Main.java | 2 +-
.../haproxy-extension/src/main/resources/velocity.properties | 1 -
5 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94d8f915/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/CommandUtil.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/CommandUtil.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/CommandUtil.java
index 7adea28..2bb3074 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/CommandUtil.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/CommandUtil.java
@@ -47,7 +47,7 @@ public class CommandUtil {
if (log.isDebugEnabled()) {
log.debug("output = " + line);
}
- output.append(line + NEW_LINE);
+ output.append(line).append(NEW_LINE);
}
StringBuilder errors = new StringBuilder();
BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream()));
@@ -55,7 +55,7 @@ public class CommandUtil {
if (log.isDebugEnabled()) {
log.debug("error = " + line);
}
- errors.append(line + NEW_LINE);
+ errors.append(line).append(NEW_LINE);
}
if (errors.length() > 0) {
throw new RuntimeException("Command execution failed: " + NEW_LINE + errors.toString());
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94d8f915/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 aca4ac9..827d33a 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
@@ -137,7 +137,7 @@ public class HAProxy implements LoadBalancer {
// Read the PIDs
Vector<String> pids = new Vector<String>();
BufferedReader reader = new BufferedReader(new FileReader(processIdFilePath));
- String pid_ = null;
+ String pid_;
while ((pid_ = reader.readLine()) != null) {
pids.add(pid_);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94d8f915/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyContext.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyContext.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyContext.java
index c1c34a8..25fe7de 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyContext.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyContext.java
@@ -31,7 +31,6 @@ public class HAProxyContext {
private static volatile HAProxyContext context;
private String executableFilePath;
- private String processIdFilePath;
private String templatePath;
private String templateName;
private String scriptsPath;
@@ -78,10 +77,6 @@ public class HAProxyContext {
return executableFilePath;
}
- public String getProcessIdFilePath() {
- return processIdFilePath;
- }
-
public String getTemplatePath() {
return templatePath;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94d8f915/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
index 2cf1044..176da20 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
@@ -41,7 +41,7 @@ public class Main {
log.info("HAProxy extension started");
}
- // Validate rumtime parameters
+ // Validate runtime parameters
HAProxyContext.getInstance().validate();
extension = new LoadBalancerExtension(new HAProxy(), new HAProxyStatsReader());
Thread thread = new Thread(extension);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94d8f915/extensions/load-balancer/haproxy-extension/src/main/resources/velocity.properties
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/resources/velocity.properties b/extensions/load-balancer/haproxy-extension/src/main/resources/velocity.properties
index 53cd86e..437aec5 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/resources/velocity.properties
+++ b/extensions/load-balancer/haproxy-extension/src/main/resources/velocity.properties
@@ -20,7 +20,6 @@
resource.loader=class, file
class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
file.resource.loader.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path=/home/imesh/templates/
runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
runtime.log.logsystem.log4j.category=velocity
input.encoding=UTF-8