# Conflicts:
#	src/broker/modules/init.go

.idea/vcs.xml

@@ -2,14 +2,31 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/apex/log" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/benbjohnson/clock" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/bmizerany/assert" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/davecgh/go-spew" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-kit/kit" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-logfmt/logfmt" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-stack/stack" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/jeanphorn/log4go" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/juliangruber/go-intersect" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/pretty" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/text" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/pkg/errors" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/pmezard/go-difflib" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/rogpeppe/go-internal" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/rs/zerolog" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/sirupsen/logrus" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/github.com/stretchr/testify" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/toolkits/file" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/atomic" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/goleak" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/multierr" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/zap" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/google.golang.org/grpc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/gopkg.in/inconshreveable/log15.v2" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v2" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v3" vcs="Git" />
   </component>
 </project>

src/broker/modules/init.go

@@ -1,11 +1,11 @@
 package modules
 
 import (
-	"broker/modules/github.com/fatih/color"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
+	"github.com/fatih/color"
+	l4g "github.com/jeanphorn/log4go"
 	"net"
 	"net/rpc"
 )
@@ -13,8 +13,8 @@ import (
 // TODO: RM 처리와 init.go 전반적으로 DI 이용하여 구현 RM 키등록 부분 구현 예정
 
 type Moscato struct {
-	queue               MsgQueue //메세지 받는 큐
-	SendQueue           chan myType //Publish Message가 들어왔을때 매칭이 된 결과물이 담김
+	queue               MsgQueue
+	SendQueue           chan myType
 	MicroServiceManager NodeManager `inject:""`
 	MatchingManager     match_manager
 	SubscriptionManager sub_manager
@@ -22,8 +22,8 @@ type Moscato struct {
 }
 
 type myType struct {
-	subList []string //sub의 ip주소를 가지고 있음
-	pubMsg  MsgUnit //Publish Message
+	subList []string
+	pubMsg  MsgUnit
 	err     error
 }
 
@@ -36,13 +36,11 @@ type Receiver struct { //RPC 서버에 등록하기 위한 변수
 }
 
 type Args struct { // 매개변수
-	JsonMsg []byte //JSON 타입으로 바뀐 메세지
-	Kind    int //메세지 종류
+	JsonMsg []byte
+	Kind    int
 }
 
 /*
-MM:MessageMiddleWare
-MS:MicroService
 MS→MM
 
 -MM 실행되면 MM서버는 열려있음(MS은 자동으로 Client)(포트 8150)
@@ -52,13 +50,13 @@ MS→MM
 -MmReceive에서 msgType 검사 후 그것에 맞게 msgUnit으로 MM의 Receive로 보냄
 
 -MM의 Receive에서 해당 Message를 처리
- */
+*/
 
-func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
-	// 메세지 타입별로 나눠서 언마샬
+func (receiver Receiver) MmReceive(args Args, reply *Reply) error { //
+	// 메세지 별로 나눠서 언마샬
 	switch args.Kind {
 
-	case KSM://KeyShareMessage
+	case KSM:
 		var msg KeyShareMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
 		if err != nil {
@@ -71,7 +69,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 			}
 		}()
 		reply.CompleteLog = "received"
-	case PM://PublishMessage
+	case PM:
 		var msg PublishMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
 		if err != nil {
@@ -85,7 +83,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 			}
 		}()
 		reply.CompleteLog = "PM received"
-	case SM://SubscriptionMessage
+	case SM:
 		var msg SubscriptionMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
 		if err != nil {
@@ -98,7 +96,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 			}
 		}()
 		reply.CompleteLog = "SM received"
-	case RM://RegisterMessage
+	case RM:
 		var msg RegisterMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
 		if err != nil {
@@ -111,7 +109,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 			}
 		}()
 		reply.CompleteLog = "RM received"
-	case WM://WithdrawMessage
+	case WM:
 		var msg WithdrawMsg
 		err := json.Unmarshal(args.JsonMsg, &msg)
 		if err != nil {
@@ -124,8 +122,7 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 			}
 		}()
 		reply.CompleteLog = "WM received"
-	default://MM이 받을 타입의 메세지가 아닌 경우
-		reply.CompleteLog="This type is inappropriate"
+	default:
 		return errors.New("message type Error: Not registered message type")
 	}
 	//reply.CompleteLog = "received completely"
@@ -133,34 +130,43 @@ func (receiver Receiver) MmReceive(args Args, reply *Reply) error {
 }
 //Recieve - MM가 MS로부터 메세지 전달받음
 func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
+	l4g.LoadConfiguration("modules/logConfig.json")
+	//rpc call
 	var msg_type = msg.CheckType()
 	//메세지 타입에 따라 다르게 처리
 	switch msg_type {
 
-	case KSM: //KeyShareMessage - 추후 구현
+	case KSM: //Key share msg
 
-	case PM: //PublishMessage
-		log.Println("PM received")
+	case PM: //Publish msg
+		//log.Println("PM received")
+		l4g.LOGGER("Test").Info("PM received")
 		moscato.queue.push(moscato.preProcessMsg(msg))
 
-	case SM: //SubscriptionMessage
-		log.Println("SM received")
+	case SM: //Subscription msg
+		//log.Println("SM received")
+		l4g.LOGGER("Test").Info("SM received")
 		err := moscato.SubscriptionManager.addSubscription(moscato.preProcessMsg(msg))
 		if err != nil {
 			println(err)
+			//return nil, err
 		}
 
-	case RM: //RegisterMessage
-		log.Println("RM received")
+	case RM: //Register msg
+		//log.Println("RM received")
+		l4g.LOGGER("Test").Info("RM received")
+		l4g.LOGGER("Test").Debug("RM received")
 		var newMsg RegisterMsg
 		newMsg = msg.(RegisterMsg)
 
 		newNode := MSNode{newMsg.From, newMsg.From}
 		resultAddNode := moscato.MicroServiceManager.AddMicroservice(newNode)
 		if resultAddNode {
-			log.Println("Node added successful")
+			//log.Println("Node added successful")
+			l4g.LOGGER("Test").Info("Node added successful")
 		} else {
-			log.Println("Node is already added, ignore RM")
+			l4g.LOGGER("Test").Error("Node is already added, ignore RM")
+			//log.Println("Node is already added, ignore RM")
 			return msg, nil
 		}
 
@@ -173,13 +179,16 @@ func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
 		go moscato.Send2MS(addr, newMsg)
 
 	case WM: //Withdraw msg
-		ip := msg.(WithdrawMsg).From
+		//ip := msg.(WithdrawMsg).From
+		//sublist := moscato.SubscriptionManager.ip2sub[ip]
+		//fmt.Println("prev list = ", sublist)
 		moscato.MicroServiceManager.RemoveMicroservice(msg.(WithdrawMsg).From)
 		moscato.SecureManager.RemoveSecureKey(msg.(WithdrawMsg).From)
-		moscato.SubscriptionManager.delete(ip) //해당 Ip주소를 가진 Subscription 정보 삭제
+		//moscato.SubscriptionManager.delete(ip)
+		//sublist2 := moscato.SubscriptionManager.ip2sub[ip]
+		//fmt.Println("after list =", sublist2)
 
-	default://MM이 받을 메세지 타입이 아닌경우
-		log.Println("Message type Error: Not registered message type")
+	default:
 		return nil, errors.New("Message type Error: Not registered message type")
 	}
 
@@ -201,6 +210,7 @@ MM→MS
 */
 
 func (moscato *Moscato) Send2MS(ipaddress string, msg MsgUnit) {
+	l4g.LoadConfiguration("logConfig.json")
 	client, err := rpc.Dial("tcp", ipaddress+":8150")
 	if err != nil {
 		fmt.Println(err)
@@ -221,7 +231,8 @@ func (moscato *Moscato) Send2MS(ipaddress string, msg MsgUnit) {
 	}
 	//log.Println(reply.CompleteLog) //잘 받았는지 확인 해줌
 	// 마이크로 서비스에게 받은 메시지는 노란색으로 출력
-	log.Println(reply.CompleteLog)
+	//log.Println(reply.CompleteLog)
+	l4g.LOGGER("Test").Info(reply.CompleteLog)
 }
 
 //Matching을 용이하게 하기위한 메세지 가공 과정
@@ -286,7 +297,6 @@ func (moscato *Moscato) Run() {
 	go func() {
 		for {
 			msg := moscato.queue.pop(true)
-			fmt.Println(msg)
 			go moscato.Matching(msg)
 			go moscato.SendWithEncrypt()
 		}
@@ -297,7 +307,7 @@ func (moscato *Moscato) Run() {
 	//rpc 등록 -> Receive 함수
 	err = rpc.Register(receiver)
 	if err != nil {
-		log.Println(err)
+		println(err)
 		return
 	}
 
@@ -317,7 +327,8 @@ func Listen() {
 	l, err1 := net.Listen("tcp", ":8160")
 
 	if err1 != nil {
-		log.Fatal(fmt.Sprintf("Unable to listen on given port: %s", err1))
+		//log.Fatal(fmt.Sprintf("Unable to listen on given port: %s", err1))
+		l4g.LOGGER("Test").Critical("Unable to listen on given port: %s", err1)
 	}
 	defer l.Close()
 
@@ -325,4 +336,4 @@ func Listen() {
 		conn, _ := l.Accept()
 		go rpc.ServeConn(conn)
 	}
-}
+}