[add] SIGINT 핸들링 추가

src/broker/modules/init.go

@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	l4g "github.com/jeanphorn/log4go"
 	"net"
 	"net/rpc"
+	"os"
+	"os/signal"
 	"strconv"
+	"syscall"
 )
 
-// TODO: RM 처리와 init.go 전반적으로 DI 이용하여 구현 RM 키등록 부분 구현 예정
-
 type Moscato struct {
 	queue               MsgQueue
 	SendQueue           chan myType
@@ -68,7 +68,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error { //
 
 			}
 		}()
-		reply.CompleteLog = "received"
+		reply.CompleteLog = "KSM received"
 	case PM:
 		var msg PublishMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
@@ -143,22 +143,24 @@ func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
 
 	case PM: //Publish msg
 		//log.Println("PM received")
-		logger.Info("PM received")
+		fromNodeName, _ := moscato.MicroServiceManager.GetIpaddr(msg.(PublishMsg).From)
+		logger.Info("PM received from:[" + fromNodeName + "]")
 		moscato.queue.push(moscato.preProcessMsg(msg))
 
 	case SM: //Subscription msg
 		//log.Println("SM received")
-		logger.Info("SM received")
+		fromNodeName, _ := moscato.MicroServiceManager.GetIpaddr(msg.(SubscriptionMsg).From)
+		logger.Info("SM received from:[" + fromNodeName + "]")
 		err := moscato.SubscriptionManager.addSubscription(moscato.preProcessMsg(msg))
 		if err != nil {
-			println(err)
+			logger.Warn(err.Error())
 			//return nil, err
 		}
 
 	case RM: //Register msg
-		logger.Info("RM received")
 		var newMsg RegisterMsg
 		newMsg = msg.(RegisterMsg)
+		logger.Info("RM received from:[" + newMsg.From + "]")
 
 		newNode := MSNode{newMsg.From, newMsg.From}
 		resultAddNode := moscato.MicroServiceManager.AddMicroservice(newNode)
@@ -179,6 +181,8 @@ func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
 		go moscato.Send2MS(addr, newMsg)
 
 	case WM: //Withdraw msg
+		fromNodeName, _ := moscato.MicroServiceManager.GetIpaddr(msg.(RegisterMsg).From)
+		logger.Info("WM received from:[" + fromNodeName + "]")
 		//ip := msg.(WithdrawMsg).From
 		//sublist := moscato.SubscriptionManager.ip2sub[ip]
 		//fmt.Println("prev list = ", sublist)
@@ -286,6 +290,21 @@ func (moscato *Moscato) Run() {
 	config := AppConfig{moscato}
 	config.config()
 
+	sigs := make(chan os.Signal, 1)
+	done := make(chan bool, 1)
+
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+
+	go func() {
+		sig := <-sigs
+		//withDraw(message, client)
+		//fmt.Println(sig)
+		_ = sig
+		done <- true
+		logger.Info("terminate Moscato Message Middleware")
+		os.Exit(0)
+	}()
+
 	//모스카토 구조체 변수 초기화
 	receiver := Receiver{moscato: moscato}
 	err := moscato.queue.queue_init()
@@ -318,10 +337,12 @@ func (moscato *Moscato) Run() {
 	go Listen()
 	logger.Info("initializing complete")
 
-	fmt.Scanln()
+	<-done
 }
 
 func Listen() {
+	logger := NewMyLogger()
+	defer logger.Sync()
 	/*
 		MS→MM일때 ⇒ port : 8160으로 열기
 
@@ -331,8 +352,7 @@ func Listen() {
 	l, err1 := net.Listen("tcp", ":8160")
 
 	if err1 != nil {
-		//log.Fatal(fmt.Sprintf("Unable to listen on given port: %s", err1))
-		l4g.LOGGER("Test").Critical("Unable to listen on given port: %s", err1)
+		logger.Fatal("Unable to listen on given port: " + err1.Error())
 	}
 	defer l.Close()
 

src/broker/modules/logConfig.go

@@ -12,9 +12,9 @@ func MyEncoderConfig() zapcore.EncoderConfig {
 		LevelKey: "L",
 		NameKey:  "N",
 		//CallerKey:      "C",
-		FunctionKey:    zapcore.OmitKey,
-		MessageKey:     "M",
-		StacktraceKey:  "S",
+		FunctionKey: zapcore.OmitKey,
+		MessageKey:  "M",
+		//StacktraceKey:  "S",
 		LineEnding:     zapcore.DefaultLineEnding,
 		EncodeLevel:    zapcore.CapitalColorLevelEncoder,
 		EncodeTime:     zapcore.ISO8601TimeEncoder,

src/broker/modules/manage.go

@@ -30,7 +30,7 @@ type MStable struct {
 //MStable 생성자
 func NewMStable() *MStable {
 	logger := NewMyLogger()
-	logger.Sync()
+	defer logger.Sync()
 
 	defer logger.Debug("node manager setting complete.")
 	return &MStable{NodeTable: make(map[string]MSNode)}
@@ -65,7 +65,7 @@ func (manager *MStable) AddMicroservice(node MSNode) bool {
 //MS삭제
 func (manager *MStable) RemoveMicroservice(nodeName string) bool {
 	logger := NewMyLogger()
-	logger.Sync()
+	defer logger.Sync()
 	//삭제 전 존재여부 확인
 	_, exists := manager.NodeTable[nodeName] //해당 이름을 가진 Node가 있는지 검색
 

src/broker/modules/secure.go

@@ -88,7 +88,7 @@ func (sc Security) ReEncPubMsg(fromPubMsg PublishMsg, nodeName string) PublishMs
 //Key제거 함수
 func (sc *Security) RemoveSecureKey(nodeName string) bool {
 	logger := NewMyLogger()
-	logger.Sync()
+	defer logger.Sync()
 	//삭제 전 존재여부 확인
 	_, exists := sc.KeyMap[nodeName]