You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/08/30 10:51:42 UTC
[incubator-servicecomb-saga] 02/02: SCB-868 polish the sh script
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 97129694f3edf39e298156a3a8925785be131b53
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Thu Aug 30 18:49:28 2018 +0800
SCB-868 polish the sh script
---
saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml | 6 +++++-
saga-demo/saga-spring-demo/saga-demo.sh | 7 +++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
index c0ab950..e6b1d95 100644
--- a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
+++ b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
@@ -14,6 +14,8 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
+##-Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
+##-Dkamon.modules.kamon-annotation.auto-start=yes
version: '2.1'
@@ -38,7 +40,7 @@ services:
- "database:postgresql.servicecomb.io"
- "grafana:grafana.servicecomb.io"
environment:
- - JAVA_OPTS=-javaagent:/maven/saga/aspectjweaver.jar -Dspring.profiles.active=prd -Dkamon.statsd.hostname=grafana.servicecomb.io -Dkamon.statsd.port=8125 -Dkamon.modules.kamon-annotation.auto-start=yes -Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
+ - JAVA_OPTS=-javaagent:/maven/saga/aspectjweaver.jar -Dspring.profiles.active=prd -Dkamon.statsd.hostname=grafana.servicecomb.io -Dkamon.statsd.port=8125 -Dkamon.modules.kamon-annotation.auto-start=yes -Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
healthcheck:
test: ["CMD-SHELL", "nc -z localhost 8080 &> /dev/null; echo $$?"]
interval: 30s
@@ -51,6 +53,8 @@ services:
grafana:
image: "kamon/grafana_graphite"
hostname: grafana
+ ports:
+ - "9081:80"
healthcheck:
test: ["CMD-SHELL", "nc -z localhost 80 &> /dev/null; echo $$?"]
interval: 30s
diff --git a/saga-demo/saga-spring-demo/saga-demo.sh b/saga-demo/saga-spring-demo/saga-demo.sh
index b89cd72..569a11b 100755
--- a/saga-demo/saga-spring-demo/saga-demo.sh
+++ b/saga-demo/saga-spring-demo/saga-demo.sh
@@ -48,7 +48,7 @@ case $1 in
up-alpha-perf)
fetch_version
echo "Starting ${service}:${version}"
- TAG=$version docker-compose -f docker-compose-alpha.yaml up
+ TAG=$version docker-compose -f docker-compose-alpha-perf.yaml up
exit $?
;;
@@ -65,17 +65,16 @@ case $1 in
TAG=$version docker-compose -f docker-compose.yaml -f docker-compose.mysql.yaml up
exit $?
;;
-
+
down)
fetch_version
echo "Stopping ${service}:${version}"
TAG=$version docker-compose down
exit $?
;;
-
+
*)
show_usage
exit 2
;;
esac
-