From 660c30602c8fd9222ea03d78a6e002489187cdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 27 Jul 2022 16:43:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86ansible.yml=E6=96=87?= =?UTF-8?q?=E4=BB=B6shell=E6=90=85=E6=8B=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/ansible.yml | 2 +- globals/testinit1/testinit1.go | 27 +++++++++------------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/deploy/ansible.yml b/deploy/ansible.yml index cb5fe84c4..78153cb48 100644 --- a/deploy/ansible.yml +++ b/deploy/ansible.yml @@ -40,4 +40,4 @@ - name: shell shell: cd {{ deploy_dir }}/conf && sed -i 's/runmode\s*=\s*.*/runmode = {{ runmode }}/' app.conf && sudo systemctl restart jx-callback-{{ runmode }} - when: runmode != "rsm" \ No newline at end of file + when: runmode != "print" \ No newline at end of file diff --git a/globals/testinit1/testinit1.go b/globals/testinit1/testinit1.go index 6a6aa1aa8..55369cbb4 100644 --- a/globals/testinit1/testinit1.go +++ b/globals/testinit1/testinit1.go @@ -1,22 +1,13 @@ package testinit1 -import ( - "path/filepath" - "runtime" - - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/globals/beegodb" - "github.com/astaxie/beego" -) - func Init() { - _, file, _, _ := runtime.Caller(0) - apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator)+".."+string(filepath.Separator)))) - beego.TestBeegoInit(apppath) - - globals.SugarLogger.Infof("testinit RunMode=%s", beego.BConfig.RunMode) - beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test - - globals.Init() - beegodb.Init() + //_, file, _, _ := runtime.Caller(0) + //apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator)+".."+string(filepath.Separator)))) + //beego.TestBeegoInit(apppath) + // + //globals.SugarLogger.Infof("testinit RunMode=%s", beego.BConfig.RunMode) + //beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test + // + //globals.Init() + //beegodb.Init() }