You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/11/02 16:30:53 UTC
[12/50] [abbrv] stratos git commit: Revert "Merge branch 'ui' of
https://github.com/anuruddhal/stratos"
Revert "Merge branch 'ui' of https://github.com/anuruddhal/stratos"
This reverts commit 1a8b38a5705a49fbd91f95d691766c522b7ab296, reversing
changes made to 23a01363c9c293d9527cafd1429761b95a81a053.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc56b3da
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc56b3da
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc56b3da
Branch: refs/heads/master
Commit: bc56b3da42018c25b56ca12de3ac439fe5acc123
Parents: bf46f5d
Author: gayangunarathne <ga...@wso2.com>
Authored: Mon Nov 2 17:00:48 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Mon Nov 2 17:00:48 2015 +0530
----------------------------------------------------------------------
.../group/GroupStatusProcessorChain.java | 4 +-
.../theme0/js/custom/applications-signup.js | 3 +-
extensions/cep/pom.xml | 2 +-
.../src/main/bin/nginx-extension.sh | 3 -
.../nginx/extension/NginxConfigWriter.java | 143 ++++++-------------
5 files changed, 49 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc56b3da/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
index 98ee1e0..feddaf5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
@@ -38,9 +38,9 @@ public class GroupStatusProcessorChain extends StatusProcessorChain {
new GroupStatusTerminatedProcessor();
add(groupStatusTerminatedProcessor);
- /*GroupStatusTerminatingProcessor groupStatusTerminatingProcessor =
+ GroupStatusTerminatingProcessor groupStatusTerminatingProcessor =
new GroupStatusTerminatingProcessor();
- add(groupStatusTerminatingProcessor);*/
+ add(groupStatusTerminatingProcessor);
GroupStatusInactiveProcessor groupStatusInactiveProcessor =
new GroupStatusInactiveProcessor();
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc56b3da/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-signup.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-signup.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-signup.js
index d1ddc53..7977824 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-signup.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-signup.js
@@ -259,8 +259,7 @@ var signupBlockTemplate = {
"repoPassword": {
"id": "root/repoPassword",
"title": "Repository Password: ",
- "type": "string",
- "format" : "password"
+ "type": "string"
}
}
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc56b3da/extensions/cep/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/pom.xml b/extensions/cep/pom.xml
index 51fc11d..58bbc49 100644
--- a/extensions/cep/pom.xml
+++ b/extensions/cep/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-extensions</artifactId>
- <version>4.1.2</version>
+ <version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>cep-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc56b3da/extensions/load-balancer/modules/nginx-extension/src/main/bin/nginx-extension.sh
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/nginx-extension/src/main/bin/nginx-extension.sh b/extensions/load-balancer/modules/nginx-extension/src/main/bin/nginx-extension.sh
index cf9c820..5deb433 100755
--- a/extensions/load-balancer/modules/nginx-extension/src/main/bin/nginx-extension.sh
+++ b/extensions/load-balancer/modules/nginx-extension/src/main/bin/nginx-extension.sh
@@ -30,9 +30,6 @@ properties="-Dnginx.private.ip=127.0.0.1
-Dtemplates.path=${script_path}/../templates
-Dtemplates.name=nginx.cfg.template
-Dscripts.path=${script_path}/../scripts
- -Dnginx.cert.path=/etc/nginx/ssl/server.cert
- -Dnginx.key.path=/etc/nginx/ssl/server.key
- -Dnginx.server.names.hash.bucket.size=128
-Dconf.file.path=/tmp/nginx.cfg
-Dstats.socket.file.path=/tmp/nginx-stats.socket
-Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc56b3da/extensions/load-balancer/modules/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java b/extensions/load-balancer/modules/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java
index 6efc474..6f6a77c 100644
--- a/extensions/load-balancer/modules/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java
+++ b/extensions/load-balancer/modules/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java
@@ -31,9 +31,7 @@ import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
/**
* Nginx load balancer configuration writer.
@@ -62,61 +60,11 @@ public class NginxConfigWriter {
StringBuilder configurationBuilder = new StringBuilder();
- List<String> availableProtocols = new ArrayList<>();
-
for (Service service : topology.getServices()) {
for (Cluster cluster : service.getClusters()) {
- if ((service.getPorts() == null) || (service.getPorts().size() == 0)) {
- throw new RuntimeException(String.format("No ports found in service: %s", service.getServiceName()));
- }
- for(Port port : service.getPorts()) {
- if(!availableProtocols.contains(port.getProtocol())) {
- availableProtocols.add(port.getProtocol());
- }
- }
+ generateConfigurationForCluster(cluster, configurationBuilder);
}
}
- for(String protocol1 : availableProtocols) {
- if(log.isDebugEnabled()) {
- log.debug("Available protocols : " + protocol1 + "\n");
- }
- }
- for(String protocol : availableProtocols) {
- // Start transport block
- configurationBuilder.append("http").append(" {").append(NEW_LINE);
- configurationBuilder.append(TAB).append("server_names_hash_bucket_size ").
- append(System.getProperty("nginx.server.names.hash.bucket.size")).
- append(";").append(NEW_LINE);
- for (Service service : topology.getServices()) {
- for (Cluster cluster : service.getClusters()) {
- if ((service.getPorts() == null) || (service.getPorts().size() == 0)) {
- throw new RuntimeException(String.format("No ports found in service: %s",
- service.getServiceName()));
- }
- Port selectedPort = null;
- for(Port port : service.getPorts()) {
- if(port.getProtocol().equals(protocol)) {
- selectedPort = port;
- }
- }
-
- if(selectedPort != null) {
- if(log.isDebugEnabled()) {
- log.debug("The selected Port for cluster: " + cluster.getClusterId()
- + " is " + selectedPort.getValue() + " " +
- selectedPort.getProtocol() + " " + selectedPort.getProxy());
- }
- generateConfigurationForCluster(cluster, selectedPort, configurationBuilder);
- }
- }
- }
- configurationBuilder.append("}").append(NEW_LINE);
- if(log.isDebugEnabled()) {
- log.debug("The generated niginx.conf is: \n" + configurationBuilder.toString());
- }
- // End transport block
- }
-
// Start velocity engine
VelocityEngine ve = new VelocityEngine();
@@ -176,59 +124,58 @@ public class NginxConfigWriter {
* }
* }
* @param cluster
- * @param port
* @param text
*/
- private void generateConfigurationForCluster(Cluster cluster, Port port, StringBuilder text) {
-
- for (String hostname : cluster.getHostNames()) {
- // Start upstream block
- text.append(TAB).append("upstream ").append(hostname).append(" {").append(NEW_LINE);
- for (Member member : cluster.getMembers()) {
- // Start upstream server block
- text.append(TAB).append(TAB).append("server ").append(member.getHostName()).append(":")
- .append(port.getValue()).append(";").append(NEW_LINE);
- // End upstream server block
- }
- text.append(TAB).append("}").append(NEW_LINE);
- // End upstream block
-
- // Start server block
- text.append(NEW_LINE);
- text.append(TAB).append("server {").append(NEW_LINE);
- if(port.getProtocol().equals("https")) {
- text.append(TAB).append(TAB).append("listen ").append(port.getProxy()).append(" ssl;").append(NEW_LINE);
- } else {
+ private void generateConfigurationForCluster(Cluster cluster, StringBuilder text) {
+
+ if((cluster.getMembers() == null) || (cluster.getMembers().size() == 0)) {
+ return;
+ }
+
+ // Find port mappings
+ Member firstMember = (Member) cluster.getMembers().toArray()[0];
+ Collection<Port> ports = firstMember.getPorts();
+
+ for (Port port : ports) {
+ for (String hostname : cluster.getHostNames()) {
+ // Start transport block
+ text.append(port.getProtocol()).append(" {").append(NEW_LINE);
+
+ // Start upstream block
+ text.append(TAB).append("upstream ").append(hostname).append(" {").append(NEW_LINE);
+ for (Member member : cluster.getMembers()) {
+ // Start upstream server block
+ text.append(TAB).append(TAB).append("server ").append(member.getHostName()).append(":")
+ .append(port.getValue()).append(";").append(NEW_LINE);
+ // End upstream server block
+ }
+ text.append(TAB).append("}").append(NEW_LINE);
+ // End upstream block
+
+ // Start server block
+ text.append(NEW_LINE);
+ text.append(TAB).append("server {").append(NEW_LINE);
text.append(TAB).append(TAB).append("listen ").append(port.getProxy()).append(";").append(NEW_LINE);
- }
- text.append(TAB).append(TAB).append("server_name ").append(hostname).append(";").append(NEW_LINE);
+ text.append(TAB).append(TAB).append("server_name ").append(hostname).append(";").append(NEW_LINE);
- text.append(TAB).append(TAB).append("location / {").append(NEW_LINE);
- if(port.getProtocol().equals("https")) {
- text.append(TAB).append(TAB).append(TAB).append("proxy_pass").append(TAB)
- .append("https://").append(hostname).append(";").append(NEW_LINE);
- } else {
+ text.append(TAB).append(TAB).append("location / {").append(NEW_LINE);
text.append(TAB).append(TAB).append(TAB).append("proxy_pass").append(TAB)
.append("http://").append(hostname).append(";").append(NEW_LINE);
- }
- text.append(TAB).append(TAB).append("}").append(NEW_LINE);
-
- text.append(TAB).append(TAB).append("location /nginx_status {").append(NEW_LINE);
- text.append(TAB).append(TAB).append(TAB).append("stub_status on;").append(NEW_LINE);
- text.append(TAB).append(TAB).append(TAB).append("access_log off;").append(NEW_LINE);
- text.append(TAB).append(TAB).append(TAB).append("allow 127.0.0.1;").append(NEW_LINE);
- text.append(TAB).append(TAB).append(TAB).append("deny all;").append(NEW_LINE);
- text.append(TAB).append(TAB).append("}").append(NEW_LINE);
-
- if(port.getProtocol().equals("https")) {
- text.append(TAB).append(TAB).append("ssl on;").append(NEW_LINE);
- text.append(TAB).append(TAB).append("ssl_certificate ").append(System.getProperty("nginx.cert.path")).append (";").append(NEW_LINE);
- text.append(TAB).append(TAB).append("ssl_certificate_key ").append(System.getProperty("nginx.key.path")).append (";").append(NEW_LINE);
- }
+ text.append(TAB).append(TAB).append("}").append(NEW_LINE);
- text.append(TAB).append("}").append(NEW_LINE);
- // End server block
+ text.append(TAB).append(TAB).append("location /nginx_status {").append(NEW_LINE);
+ text.append(TAB).append(TAB).append(TAB).append("stub_status on;").append(NEW_LINE);
+ text.append(TAB).append(TAB).append(TAB).append("access_log off;").append(NEW_LINE);
+ text.append(TAB).append(TAB).append(TAB).append("allow 127.0.0.1;").append(NEW_LINE);
+ text.append(TAB).append(TAB).append(TAB).append("deny all;").append(NEW_LINE);
+ text.append(TAB).append(TAB).append("}").append(NEW_LINE);
+ text.append(TAB).append("}").append(NEW_LINE);
+ // End server block
+
+ text.append("}").append(NEW_LINE);
+ // End transport block
+ }
}
}
}