[refactor, feat] 모스카토 구조체 변경, 매칭 큐 추가

src/broker/modules/init.go

@@ -4,35 +4,29 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/fatih/color"
+	_ "github.com/fatih/color"
 	"log"
 	"net"
 	"net/rpc"
 )
 
 // TODO: RM 처리와 init.go 전반적으로 DI 이용하여 구현 RM 키등록 부분 구현 예정
-//temporary type for matching manager
-//type match_manager struct{}
-
-func (match_mng *match_manager) matching(queue *MsgQueue) {
-	//msg := queue.pop(true)
-	//Implement here ~~
-}
-
-func (match_mng *match_manager) add_subscription(msg MsgUnit) {
-
-}
-
-//temporary type for secure(key) manager
-type secure_manager struct{}
 
 type Moscato struct {
 	queue               MsgQueue
+	SendQueue			chan myType
 	MicroServiceManager NodeManager `inject:""`
 	MatchingManager     match_manager
+	Subscriptionmanager	sub_manager
 	SecureManager       SecurityManager `inject:""`
 }
 
+type myType struct{
+	subList	[]string
+	pubMsg	MsgUnit
+	err		error
+}
+
 type Reply struct {
 	CompleteLog string
 }
@@ -144,7 +138,7 @@ func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
 		moscato.queue.push(msg.(PublishMsg))
 
 	case SM: //Subscription msg
-		moscato.MatchingManager.add_subscription(msg.(*SubscriptionMsg))
+		moscato.Subscriptionmanager.addSubscription(msg.(*SubscriptionMsg))
 
 	case RM: //Register msg
 		log.Println("RM received")
@@ -217,7 +211,7 @@ func (moscato *Moscato) Run() {
 	}
 
 	//go routine -> matching 동작
-	go moscato.MatchingManager.matching(&moscato.queue)
+	go moscato.Matching()
 	go moscato.CheckQueue()
 
 	//rpc 등록 -> Receive 함수
@@ -228,7 +222,7 @@ func (moscato *Moscato) Run() {
 	}
 
 	go Listen()
-	color.Blue("initializing complete.")
+	//color.Blue("initializing complete.")
 	fmt.Scanln()
 }
 
@@ -254,4 +248,4 @@ func Listen() {
 		conn, _ := l2.Accept()
 		go rpc.ServeConn(conn)
 	}*/
-}
+}