up super env

liquanzhou · Aug 20, 2019 · 3db2288 · 3db2288
1 parent 7f8e753
commit 3db2288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/main/forms.py b/app/main/forms.py
@@ -102,7 +102,7 @@ def deployConfig(project, host, ones, ones1, ones2):
 
 
 supervisor_python_conf = '''[program:$environment$_$project$]
-environment=HOME=/home/$USER$,PYTHONPATH=$HOST_PATH$$environment$_$project$,PROJECT_ENV="$environment$",PRODUCT_ENV="",$env$
+environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PROJECT_NAME=$project$,PROJECT_PORT=$port$,PROJECT_PATH="$HOST_PATH$$environment$_$project$/",PRODUCT_ENV="",$env$
 directory=$HOST_PATH$$environment$_$project$/
 command=/usr/bin/python  $HOST_PATH$$environment$_$project$/main.py --port=%(process_num)02d
 process_name=%(process_num)d
@@ -121,7 +121,7 @@ def deployConfig(project, host, ones, ones1, ones2):
 '''
 
 supervisor_nodejs_conf = '''[program:$environment$_$project$]
-environment=HOME=/home/$USER$,PYTHONPATH=$HOST_PATH$$environment$_$project$,PROJECT_ENV="$environment$",PRODUCT_ENV="",$env$
+environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PROJECT_NAME=$project$,PROJECT_PORT=$port$,PROJECT_PATH="$HOST_PATH$$environment$_$project$/",PRODUCT_ENV="",$env$
 directory=$HOST_PATH$$environment$_$project$/
 command=/usr/bin/node $HOST_PATH$$environment$_$project$/index.js --port=%(process_num)d
 process_name=%(process_num)d
@@ -140,7 +140,7 @@ def deployConfig(project, host, ones, ones1, ones2):
 '''
 
 supervisor_go_conf = '''[program:$environment$_$project$]
-environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PRODUCT_ENV="",$env$
+environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PROJECT_NAME=$project$,PROJECT_PORT=$port$,PROJECT_PATH="$HOST_PATH$$environment$_$project$/",PRODUCT_ENV="",$env$
 directory=$HOST_PATH$$environment$_$project$/
 command=$HOST_PATH$$environment$_$project$/bin/$project$ -f $HOST_PATH$$environment$_$project$/etc/$project-env$.conf
 process_name = %(process_num)d
@@ -158,7 +158,7 @@ def deployConfig(project, host, ones, ones1, ones2):
 '''
 
 supervisor_sh_conf = '''[program:$environment$_$project$]
-environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PRODUCT_ENV="",$env$
+environment=HOME=/home/$USER$,PROJECT_ENV="$environment$",PROJECT_NAME=$project$,PROJECT_PORT=$port$,PROJECT_PATH="$HOST_PATH$$environment$_$project$/",PRODUCT_ENV="",$env$
 directory=$HOST_PATH$$environment$_$project$/
 command=/bin/bash $HOST_PATH$$environment$_$project$/deploy_start.sh
 process_name = %(process_num)d

diff --git a/app/static/ops.js b/app/static/ops.js
@@ -481,7 +481,7 @@ $("body").on('click', '#btn_submit', function(){
         };
         $.getJSON('/lock_check', param, function(data){
             if(data['status'] == "ok"){
-                if (confirm('请确认更新' + p + '并重启服务!')) {
+                if (confirm('请确认更新' + p + '并重启服务!\u000d重要: 请确认数据库索引已经提前创建')) {
                     updateonline(param)
                     online_tag(p)
                     current_tag(p)