修复部分问题

This commit is contained in:
ascrutae 2016-12-19 11:24:22 +08:00
parent 910975fd00
commit befb8f302c
4 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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();
}