From 955714bc5e6b80c0ebf6e16ce3158158c1beb031 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 5 Aug 2021 17:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E4=BD=BF=E7=94=A8et?= =?UTF-8?q?cd=E7=9A=84=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app_config.yaml | 1 + infra/config/config.go | 1 + main.go | 14 ++++++++------ scheduler/extract.go | 9 ++++++--- scheduler/load.go | 9 ++++++--- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/conf/app_config.yaml b/conf/app_config.yaml index ddc538a..2b84c85 100644 --- a/conf/app_config.yaml +++ b/conf/app_config.yaml @@ -26,3 +26,4 @@ app: localaddr: 127.0.0.1 mod: release name: ETL + useetcd: false diff --git a/infra/config/config.go b/infra/config/config.go index e42df6a..5e1057d 100644 --- a/infra/config/config.go +++ b/infra/config/config.go @@ -38,6 +38,7 @@ type App struct { LocalAddr string `yaml:"localaddr"` Mod string `yaml:"mod"` Name string `yaml:"name"` + UseETCD bool `yaml:"useetcd"` } type ETCD struct { diff --git a/main.go b/main.go index 650a220..f50c121 100644 --- a/main.go +++ b/main.go @@ -130,19 +130,21 @@ func appMain() { if err != nil { log.Fatal("init db engine failed, error:", err) } - common.CheckServiceDao = dal.NewETCDServiceDAO(db.AppEtcdClient, config.AppConfig.App.LocalAddr) - defer common.CheckServiceDao.RevokeLease() + // start scheduler err = scheduler.Start() if err != nil { log.Fatal("start scheduler failed error:", err) } // register app service to etcd - err = RegisterAppService() - if err != nil { - log.Fatal("register service to etcd failed, error:", err) + if config.AppConfig.UseETCD { + common.CheckServiceDao = dal.NewETCDServiceDAO(db.AppEtcdClient, config.AppConfig.App.LocalAddr) + defer common.CheckServiceDao.RevokeLease() + err = RegisterAppService() + if err != nil { + log.Fatal("register service to etcd failed, error:", err) + } } - // new iris application app := iris.New() routes.Hub(app) diff --git a/scheduler/extract.go b/scheduler/extract.go index d6e1e6d..19c8013 100644 --- a/scheduler/extract.go +++ b/scheduler/extract.go @@ -1,6 +1,7 @@ package scheduler import ( + "LAPP_ETL/infra/config" "LAPP_ETL/infra/logger" model "LAPP_ETL/models/etl" svr "LAPP_ETL/services/etl" @@ -8,9 +9,11 @@ import ( ) func ETLExtract() { - if !CheckService() { - fmt.Println("service is stop") - return + if config.AppConfig.UseETCD { + if !CheckService() { + fmt.Println("service is stop") + return + } } log, _ := logger.NewLogger(-1, "Scheduler") taskService := svr.NewTaskHeadService() diff --git a/scheduler/load.go b/scheduler/load.go index 65396a3..ee0d4ed 100644 --- a/scheduler/load.go +++ b/scheduler/load.go @@ -1,6 +1,7 @@ package scheduler import ( + "LAPP_ETL/infra/config" "LAPP_ETL/infra/logger" model "LAPP_ETL/models/etl" svr "LAPP_ETL/services/etl" @@ -8,9 +9,11 @@ import ( ) func ETLLoad() { - if !CheckService() { - fmt.Println("service is stop") - return + if config.AppConfig.UseETCD { + if !CheckService() { + fmt.Println("service is stop") + return + } } log, _ := logger.NewLogger(-1, "Scheduler") taskService := svr.NewTaskHeadService()