From 712d0051d9e2fa3303fe813298d8260dcee0dcc5 Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Sat, 7 Nov 2020 08:18:33 +0800
Subject: [PATCH] code refactor

---
 src/modules/ams/ams.go           |  2 +-
 src/modules/job/job.go           |  2 +-
 src/modules/rdb/rabbitmq/conn.go | 17 ++++++++++++++---
 src/modules/rdb/rdb.go           | 12 +++---------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/modules/ams/ams.go b/src/modules/ams/ams.go
index 3c49786c..c883ca85 100644
--- a/src/modules/ams/ams.go
+++ b/src/modules/ams/ams.go
@@ -77,5 +77,5 @@ func endingProc() {
 
 	logger.Close()
 	http.Shutdown()
-	fmt.Println("portal stopped successfully")
+	fmt.Println("process stopped successfully")
 }
diff --git a/src/modules/job/job.go b/src/modules/job/job.go
index 618addd7..78391bb3 100644
--- a/src/modules/job/job.go
+++ b/src/modules/job/job.go
@@ -105,5 +105,5 @@ func endingProc() {
 
 	logger.Close()
 	http.Shutdown()
-	fmt.Println("portal stopped successfully")
+	fmt.Println("process stopped successfully")
 }
diff --git a/src/modules/rdb/rabbitmq/conn.go b/src/modules/rdb/rabbitmq/conn.go
index 18606dbf..57a115b1 100644
--- a/src/modules/rdb/rabbitmq/conn.go
+++ b/src/modules/rdb/rabbitmq/conn.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/streadway/amqp"
 	"github.com/toolkits/pkg/logger"
+
+	"github.com/didi/nightingale/src/modules/rdb/config"
 )
 
 var (
@@ -13,7 +15,14 @@ var (
 	exit = make(chan bool)
 )
 
-func Init(url string) {
+func Init() {
+	if config.Config.RabbitMQ.Enable {
+		dial(config.Config.RabbitMQ.Addr)
+		go Consume(config.Config.RabbitMQ.Addr, config.Config.RabbitMQ.Queue)
+	}
+}
+
+func dial(url string) {
 	var err error
 	conn, err = amqp.Dial(url)
 	if err != nil {
@@ -70,6 +79,8 @@ func close() {
 }
 
 func Shutdown() {
-	conn.Close()
-	exit <- true
+	if config.Config.RabbitMQ.Enable {
+		conn.Close()
+		exit <- true
+	}
 }
diff --git a/src/modules/rdb/rdb.go b/src/modules/rdb/rdb.go
index 88c7e651..79578ea1 100644
--- a/src/modules/rdb/rdb.go
+++ b/src/modules/rdb/rdb.go
@@ -68,10 +68,7 @@ func main() {
 	cron.InitWorker()
 
 	// 初始化 rabbitmq 处理部分异步逻辑
-	if config.Config.RabbitMQ.Enable {
-		rabbitmq.Init(config.Config.RabbitMQ.Addr)
-		go rabbitmq.Consume(config.Config.RabbitMQ.Addr, config.Config.RabbitMQ.Queue)
-	}
+	rabbitmq.Init()
 
 	go cron.ConsumeMail()
 	go cron.ConsumeSms()
@@ -101,10 +98,7 @@ func endingProc() {
 	logger.Close()
 	http.Shutdown()
 	redisc.CloseRedis()
+	rabbitmq.Shutdown()
 
-	if config.Config.RabbitMQ.Enable {
-		rabbitmq.Shutdown()
-	}
-
-	fmt.Println("stopped successfully")
+	fmt.Println("process stopped successfully")
 }