Error handling

laoshanxi · Sep 13, 2021 · f73333e · f73333e
1 parent 780ef66
commit f73333e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 RELEASE_DIR=./release
-VER=1.9.4
+VER=2.0.0
 NODE_VER=10.17.0-jessie
 DOCKER_IMG_NAME=appmesh-ui:${VER}
 
@@ -29,7 +29,7 @@ run:
 	appc logon -u admin -x Admin123
 	appc unreg -n appweb -f
 	# use host mode for nginx reverse proxy redirect to 6060/8500
-	appc reg -n appweb --perm 11 -u root -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d "laoshanxi/appmesh-ui:${VER}" -f
+	appc reg -n appweb --perm 11 --exit restart -u root -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d "laoshanxi/appmesh-ui:${VER}" -f
 
 dev:
 	git pull

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 ## Build Docker image
 ```bash
-VER=1.9.4
+VER=2.0.0
 cd appmesh-ui/
 make
 
@@ -43,7 +43,7 @@ npm run lint -- --fix
 ## Deploy
 Use host mode networking for Nginx reverse proxy (need accept host 443 port)
 ```shell
-appc reg -n appweb --perm 11 -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d laoshanxi/appmesh-ui:1.9.4 -f
+appc reg -n appweb --perm 11 --exit restart -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d laoshanxi/appmesh-ui:2.0.0 -f
 ```
 Or use Docker native API way to manage container app:
 ```shell
@@ -59,7 +59,7 @@ tee appweb.json <<-'EOF'
     }
 }
 EOF
-appc reg -n appweb --perm 11 -g @./appweb.json -d laoshanxi/appmesh-ui:1.9.4
+appc reg -n appweb --perm 11 --exit restart -g @./appweb.json -d laoshanxi/appmesh-ui:2.0.0
 ```
 
 ## Demo

diff --git a/src/views/applications/appDetail/index.vue b/src/views/applications/appDetail/index.vue
@@ -88,13 +88,12 @@
       <Description term="Start interval seconds (S)">{{
         record.start_interval_seconds | formatEmpty
       }}</Description>
-      <Description term="Start tnterval timeout (S)">{{
-        record.start_interval_timeout | formatEmpty
+      <Description term="Retention (S)">{{
+        record.retention | formatEmpty
+      }}</Description>
+      <Description term="Exit behavior">{{
+        record.behavior.exit | formatEmpty
       }}</Description>
-      <Description term="Keep running">
-        <el-tag v-if="record.keep_running == 1" :type="'success'">Yes</el-tag>
-        <el-tag v-else :type="'info'">No</el-tag>
-      </Description>
     </DescriptionList>
     <el-divider></el-divider>
 

diff --git a/src/views/applications/appReg/index.vue b/src/views/applications/appReg/index.vue
@@ -76,17 +76,19 @@
             :inactive-value="false"
           ></el-switch>
         </el-form-item>
-        <el-form-item label="Start interval timeout" prop="start_interval_timeout">
-          <el-input v-model="registerForm.start_interval_timeout"></el-input>(ISO 8601 durations or seconds)
+        <el-form-item label="Retention" prop="retention">
+          <el-input v-model="registerForm.retention"></el-input>(ISO 8601 durations or seconds)
         </el-form-item>
-        <el-form-item label="Keep running" prop="keep_running">
-          <el-switch
-            v-model="registerForm.keep_running"
-            :active-value="true"
-            :inactive-value="false"
-          ></el-switch>
+        <el-form-item label="Behavior" prop="behavior.exit">
+          <el-select v-model="registerForm.behavior.exit" placeholder="Please select">
+            <el-option
+              v-for="item in Behaviors"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-
         <el-divider></el-divider>
 
         <el-form-item label="Start time" prop="start_time">
@@ -196,6 +198,24 @@ export default {
           },
         ],
       },
+      Behaviors: [
+        {
+          label: "standby",
+          value: "standby",
+        },
+        {
+          label: "restart",
+          value: "restart",
+        },
+        {
+          label: "keepalive",
+          value: "keepalive",
+        },
+        {
+          label: "remove",
+          value: "remove",
+        },
+      ],
     };
   },
   props: ["propForm"],
@@ -273,13 +293,14 @@ export default {
         posix_timezone: "",
         docker_image: "",
         pid: null,
-
         start_interval_seconds: null,
         cron: false,
         start_time: "",
-        start_interval_timeout: null,
-
-        keep_running: false, //0 no, 1 yes
+        end_time: "",
+        retention: 0,
+        behavior: {
+          exit: "standby",
+        }
       };
     },
     cancel() {