From befb8f302c9d5e91bcbfcd7f36610477d0138500 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Mon, 19 Dec 2016 11:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                            | 2 +-
 skywalking-alarm/docker/config.properties                     | 2 +-
 skywalking-alarm/docker/docker-entrypoint.sh                  | 4 ++--
 .../src/main/java/com/a/eye/skywalking/routing/Main.java      | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ae2ebce2e2..5608cd7abf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - MYSQL_SERVER=mysql-server:3306
       - REDIS_SERVER=redis-server:6379
       - WEBUI_DEPLOY_ADDRESS=192.168.1.104:8080
-      - WEBUI_CONTEXT_NAME=skywalking
+      - WEBUI_APPLICATION_CONTEXT=skywalking
       - ALARM_MAIL_HOST=smtp.mail.com
       - MAIL_USER_NAME=skywalking
       - MAIL_PASSWORD=skywalking
diff --git a/skywalking-alarm/docker/config.properties b/skywalking-alarm/docker/config.properties
index 04a23752d3..57fa50f307 100644
--- a/skywalking-alarm/docker/config.properties
+++ b/skywalking-alarm/docker/config.properties
@@ -72,7 +72,7 @@ mailsenderinfo.password={MAIL_PASSWORD}
 mailsenderinfo.sender={MAIL_SENDER_MAIL}
 mailsenderinfo.ssl_enable={MAIL_SSL_ENABLE}
 #邮件模板配置id
-templateinfo.portal_url=http://{WEBUI_DEPLOY_ADDRESS}/{WEBUI_CONTEXT_NAME}
+templateinfo.portal_url=http://{WEBUI_DEPLOY_ADDRESS}/{WEBUI_APPLICATION_CONTEXT}
 
 #尝试获取轮询锁的周期(单位:毫秒)
 inspectthread.retry_get_inspect_lock_interval=10000
diff --git a/skywalking-alarm/docker/docker-entrypoint.sh b/skywalking-alarm/docker/docker-entrypoint.sh
index 591370cf84..f8ee69ad22 100644
--- a/skywalking-alarm/docker/docker-entrypoint.sh
+++ b/skywalking-alarm/docker/docker-entrypoint.sh
@@ -34,8 +34,8 @@ eval sed -i -e 's/\{MAIL_SENDER_MAIL\}/$MAIL_SENDER_MAIL/' /usr/local/skywalking
 echo "replace WEBUI_DEPLOY_ADDRESS with $WEBUI_DEPLOY_ADDRESS"
 eval sed -i -e 's/\{WEBUI_DEPLOY_ADDRESS\}/$WEBUI_DEPLOY_ADDRESS/' /usr/local/skywalking-alarm/config/config.properties
 
-echo "replace WEBUI_CONTEXT_NAME with $WEBUI_CONTEXT_NAME"
-eval sed -i -e 's/\{WEBUI_CONTEXT_NAME\}/$WEBUI_CONTEXT_NAME/' /usr/local/skywalking-alarm/config/config.properties
+echo "replace WEBUI_CONTEXT_NAME with $WEBUI_APPLICATION_CONTEXT"
+eval sed -i -e 's/\{WEBUI_APPLICATION_CONTEXT\}/$WEBUI_APPLICATION_CONTEXT/' /usr/local/skywalking-alarm/config/config.properties
 
 mkdir -p /usr/local/skywalking-alarm/logs
 
diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java
index 55ce61642c..0112413c5a 100644
--- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java
+++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java
@@ -38,6 +38,7 @@ public class Main {
             Thread.currentThread().join();
         } catch (Exception e) {
             logger.error("Failed to start routing service.", e);
+            System.exit(-1);
         } finally {
             RoutingService.stop();
         }
-- 
GitLab