Merge pull request '添加对使用etcd的配置参数' (#11) from feature_etcd into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_ETL/pulls/11

conf/app_config.yaml

@@ -26,3 +26,4 @@ app:
   localaddr: 127.0.0.1
   mod: release
   name: ETL
+  useetcd: false

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 {

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)

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()

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()