You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/02/26 06:37:32 UTC
[1/2] stratos git commit: Formatting single cartridge sample
Repository: stratos
Updated Branches:
refs/heads/master-deployment-policy-fix-merge 7b7464708 -> bd428134a
Formatting single cartridge sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe47f890
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe47f890
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe47f890
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: fe47f890eee32b36df8348cea68c449fe63c2398
Parents: 7b74647
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Feb 26 11:05:43 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Feb 26 11:05:43 2015 +0530
----------------------------------------------------------------------
samples/applications/single-cartridge/artifacts/application.json | 2 +-
.../single-cartridge/artifacts/ec2/deployment-policy.json | 4 ++--
.../single-cartridge/artifacts/kubernetes/deployment-policy.json | 2 +-
.../single-cartridge/artifacts/mock/deployment-policy.json | 2 +-
.../single-cartridge/artifacts/openstack/deployment-policy.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe47f890/samples/applications/single-cartridge/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/application.json b/samples/applications/single-cartridge/artifacts/application.json
index 6ef0c02..d272c2b 100644
--- a/samples/applications/single-cartridge/artifacts/application.json
+++ b/samples/applications/single-cartridge/artifacts/application.json
@@ -9,7 +9,7 @@
"cartridgeMin": 1,
"cartridgeMax": 10,
"subscribableInfo":{
- "alias":"php1",
+ "alias":"my-php",
"autoscalingPolicy":"autoscaling-policy-1",
"deploymentPolicy":"deployment-policy-1",
"artifactRepository":{
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe47f890/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
index e690bbf..1e6e017 100644
--- a/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
@@ -21,7 +21,7 @@
},
"childPolicies": [
{
- "alias": "php1",
+ "alias": "my-php",
"networkPartition": [
{
"id": "network-partition-1",
@@ -36,4 +36,4 @@
]
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe47f890/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
index 7528437..5b91bfd 100644
--- a/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
@@ -22,7 +22,7 @@
},
"childPolicies": [
{
- "alias": "php1",
+ "alias": "my-php",
"networkPartition": [
{
"id": "network-partition-1",
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe47f890/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json b/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
index 0444ea3..328681e 100644
--- a/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
@@ -21,7 +21,7 @@
},
"childPolicies": [
{
- "alias": "php1",
+ "alias": "my-php",
"networkPartition": [
{
"id": "network-partition-1",
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe47f890/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
index cf8d9f7..d2a0ec8 100644
--- a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
@@ -21,7 +21,7 @@
},
"childPolicies": [
{
- "alias": "php1",
+ "alias": "my-php",
"networkPartition": [
{
"id": "network-partition-1",
[2/2] stratos git commit: Formatting app/group activation logs
Posted by la...@apache.org.
Formatting app/group activation logs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bd428134
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bd428134
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bd428134
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: bd428134a0b99d90fa016621175cb43b4b1709d8
Parents: fe47f89
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Feb 26 11:06:13 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Feb 26 11:06:13 2015 +0530
----------------------------------------------------------------------
.../processor/group/GroupStatusActiveProcessor.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd428134/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
index 8a9da5c..84f15a3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
@@ -92,14 +92,20 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
//send activation event
if (component instanceof Application) {
//send application activated event
- log.info("sending application active for [application] " + appId + " [instance] "
- + instanceId);
+
+ if(log.isInfoEnabled()){
+ log.info(String.format("Sending application active for [application] %s [instance] %s ", appId
+ , instanceId));
+ }
ApplicationBuilder.handleApplicationInstanceActivatedEvent(appId, instanceId);
return true;
} else if (component instanceof Group) {
//send activation to the parent
- log.info("sending group instance active for [group] " +
- component.getUniqueIdentifier() + " [instance] " + instanceId);
+
+ if(log.isInfoEnabled()){
+ log.info(String.format("Sending group instance active for [group] %s [instance] %s ", component.getUniqueIdentifier()
+ , instanceId));
+ }
ApplicationBuilder.handleGroupInstanceActivatedEvent(appId, component.getUniqueIdentifier(), instanceId);
return true;
}