fix bug

JThink · Dec 4, 2017 · cd0f2e1 · cd0f2e1
1 parent a025127
commit cd0f2e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     restart: always
     mem_limit: 2g
     volumes:
-      - /home/upsmart/deploy/skyeye/logs/skyeye-collector/backup:/home/deploy/logs
+      - /home/upsmart/deploy/skyeye/logs/collector/backup:/home/deploy/logs
       - /tmp/monitor-center:/tmp/monitor-center
   skyeye-collector-indexer:
     image: 192.168.88.73:8888/skyeye/skyeye-collector-indexer:1.3.0
@@ -30,29 +30,29 @@ services:
     restart: always
     mem_limit: 4g
     volumes:
-      - /home/upsmart/deploy/skyeye/logs/skyeye-collector/indexer:/home/deploy/logs
+      - /home/upsmart/deploy/skyeye/logs/collector/indexer:/home/deploy/logs
   skyeye-collector-metrics:
     image: 192.168.88.73:8888/skyeye/skyeye-collector-metrics:1.3.0
     container_name: skyeye-collector-metrics
     scale: 3
     restart: always
     mem_limit: 2g
     volumes:
-      - /home/upsmart/deploy/skyeye/logs/skyeye-collector/metrics:/home/deploy/logs
+      - /home/upsmart/deploy/skyeye/logs/collector/metrics:/home/deploy/logs
   skyeye-collector-trace:
     image: 192.168.88.73:8888/skyeye/skyeye-collector-trace:1.3.0
     container_name: skyeye-collector-trace
     scale: 3
     restart: always
     mem_limit: 3g
     volumes:
-      - /home/upsmart/deploy/skyeye/logs/skyeye-collector/trace:/home/deploy/logs
+      - /home/upsmart/deploy/skyeye/logs/collector/trace:/home/deploy/logs
   skyeye-web:
     image: 192.168.88.73:8888/skyeye/skyeye-web:1.3.0
     container_name: skyeye-web
     restart: always
     mem_limit: 4g
     volumes:
-      - /home/upsmart/deploy/skyeye/logs/skyeye-web:/home/deploy/logs
+      - /home/upsmart/deploy/skyeye/logs/web:/home/deploy/logs
     ports:
      - "18090:8090"
diff --git a/skyeye-alarm/src/main/resources/application.properties b/skyeye-alarm/src/main/resources/application.properties
@@ -25,4 +25,4 @@ spring.mail.jthink.port=${mail.jthink.port}
 spring.mail.jthink.from=${mail.jthink.from}
 spring.mail.jthink.cc=${mail.jthink.cc}
 spring.mail.jthink.password=${mail.jthink.password}
-spring.alert.mail.switchFlag=${alert.mail.switchFlag}
+spring.mail.jthink.switchFlag=${alert.mail.switchFlag}