kidjung 4 лет назад
Родитель
Сommit
0dfe8bd517
2 измененных файлов: 36 добавлений и 9 удалений
  1. 17
    0
      .idea/vcs.xml
  2. 19
    9
      src/broker/modules/init.go

+ 17
- 0
.idea/vcs.xml Просмотреть файл

2
 <project version="4">
2
 <project version="4">
3
   <component name="VcsDirectoryMappings">
3
   <component name="VcsDirectoryMappings">
4
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
4
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+    <mapping directory="$PROJECT_DIR$/src/github.com/apex/log" vcs="Git" />
6
+    <mapping directory="$PROJECT_DIR$/src/github.com/benbjohnson/clock" vcs="Git" />
5
     <mapping directory="$PROJECT_DIR$/src/github.com/bmizerany/assert" vcs="Git" />
7
     <mapping directory="$PROJECT_DIR$/src/github.com/bmizerany/assert" vcs="Git" />
6
     <mapping directory="$PROJECT_DIR$/src/github.com/davecgh/go-spew" vcs="Git" />
8
     <mapping directory="$PROJECT_DIR$/src/github.com/davecgh/go-spew" vcs="Git" />
9
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-kit/kit" vcs="Git" />
10
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-logfmt/logfmt" vcs="Git" />
11
+    <mapping directory="$PROJECT_DIR$/src/github.com/go-stack/stack" vcs="Git" />
12
+    <mapping directory="$PROJECT_DIR$/src/github.com/jeanphorn/log4go" vcs="Git" />
7
     <mapping directory="$PROJECT_DIR$/src/github.com/juliangruber/go-intersect" vcs="Git" />
13
     <mapping directory="$PROJECT_DIR$/src/github.com/juliangruber/go-intersect" vcs="Git" />
8
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/pretty" vcs="Git" />
14
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/pretty" vcs="Git" />
9
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/text" vcs="Git" />
15
     <mapping directory="$PROJECT_DIR$/src/github.com/kr/text" vcs="Git" />
16
+    <mapping directory="$PROJECT_DIR$/src/github.com/pkg/errors" vcs="Git" />
10
     <mapping directory="$PROJECT_DIR$/src/github.com/pmezard/go-difflib" vcs="Git" />
17
     <mapping directory="$PROJECT_DIR$/src/github.com/pmezard/go-difflib" vcs="Git" />
11
     <mapping directory="$PROJECT_DIR$/src/github.com/rogpeppe/go-internal" vcs="Git" />
18
     <mapping directory="$PROJECT_DIR$/src/github.com/rogpeppe/go-internal" vcs="Git" />
19
+    <mapping directory="$PROJECT_DIR$/src/github.com/rs/zerolog" vcs="Git" />
20
+    <mapping directory="$PROJECT_DIR$/src/github.com/sirupsen/logrus" vcs="Git" />
12
     <mapping directory="$PROJECT_DIR$/src/github.com/stretchr/testify" vcs="Git" />
21
     <mapping directory="$PROJECT_DIR$/src/github.com/stretchr/testify" vcs="Git" />
22
+    <mapping directory="$PROJECT_DIR$/src/github.com/toolkits/file" vcs="Git" />
23
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/atomic" vcs="Git" />
24
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/goleak" vcs="Git" />
25
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/multierr" vcs="Git" />
26
+    <mapping directory="$PROJECT_DIR$/src/go.uber.org/zap" vcs="Git" />
27
+    <mapping directory="$PROJECT_DIR$/src/google.golang.org/grpc" vcs="Git" />
28
+    <mapping directory="$PROJECT_DIR$/src/gopkg.in/inconshreveable/log15.v2" vcs="Git" />
29
+    <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v2" vcs="Git" />
13
     <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v3" vcs="Git" />
30
     <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v3" vcs="Git" />
14
   </component>
31
   </component>
15
 </project>
32
 </project>

+ 19
- 9
src/broker/modules/init.go Просмотреть файл

5
 	"errors"
5
 	"errors"
6
 	"fmt"
6
 	"fmt"
7
 	"github.com/fatih/color"
7
 	"github.com/fatih/color"
8
-	"log"
8
+	l4g "github.com/jeanphorn/log4go"
9
 	"net"
9
 	"net"
10
 	"net/rpc"
10
 	"net/rpc"
11
 )
11
 )
172
 
172
 
173
 //Recieve - MM가 msg전달 받음
173
 //Recieve - MM가 msg전달 받음
174
 func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
174
 func (moscato *Moscato) Receive(msg MsgUnit) (MsgUnit, error) {
175
+	l4g.LoadConfiguration("modules/logConfig.json")
175
 	//rpc call
176
 	//rpc call
176
 	var msg_type = msg.CheckType()
177
 	var msg_type = msg.CheckType()
177
 	//메세지 타입에 따라 다르게 처리
178
 	//메세지 타입에 따라 다르게 처리
180
 	case KSM: //Key share msg
181
 	case KSM: //Key share msg
181
 
182
 
182
 	case PM: //Publish msg
183
 	case PM: //Publish msg
183
-		log.Println("PM received")
184
+		//log.Println("PM received")
185
+		l4g.LOGGER("Test").Info("PM received")
184
 		moscato.queue.push(moscato.preProcessMsg(msg))
186
 		moscato.queue.push(moscato.preProcessMsg(msg))
185
 
187
 
186
 	case SM: //Subscription msg
188
 	case SM: //Subscription msg
187
-		log.Println("SM received")
189
+		//log.Println("SM received")
190
+		l4g.LOGGER("Test").Info("SM received")
188
 		err := moscato.SubscriptionManager.addSubscription(moscato.preProcessMsg(msg))
191
 		err := moscato.SubscriptionManager.addSubscription(moscato.preProcessMsg(msg))
189
 		if err != nil {
192
 		if err != nil {
190
 			println(err)
193
 			println(err)
192
 		}
195
 		}
193
 
196
 
194
 	case RM: //Register msg
197
 	case RM: //Register msg
195
-		log.Println("RM received")
198
+		//log.Println("RM received")
199
+		l4g.LOGGER("Test").Info("RM received")
200
+		l4g.LOGGER("Test").Debug("RM received")
196
 		var newMsg RegisterMsg
201
 		var newMsg RegisterMsg
197
 		newMsg = msg.(RegisterMsg)
202
 		newMsg = msg.(RegisterMsg)
198
 
203
 
199
 		newNode := MSNode{newMsg.From, newMsg.From}
204
 		newNode := MSNode{newMsg.From, newMsg.From}
200
 		resultAddNode := moscato.MicroServiceManager.AddMicroservice(newNode)
205
 		resultAddNode := moscato.MicroServiceManager.AddMicroservice(newNode)
201
 		if resultAddNode {
206
 		if resultAddNode {
202
-			log.Println("Node added successful")
207
+			//log.Println("Node added successful")
208
+			l4g.LOGGER("Test").Info("Node added successful")
203
 		} else {
209
 		} else {
204
-			log.Println("Node is already added, ignore RM")
210
+			l4g.LOGGER("Test").Error("Node is already added, ignore RM")
211
+			//log.Println("Node is already added, ignore RM")
205
 			return msg, nil
212
 			return msg, nil
206
 		}
213
 		}
207
 
214
 
245
 */
252
 */
246
 
253
 
247
 func (moscato *Moscato) Send2MS(ipaddress string, msg MsgUnit) {
254
 func (moscato *Moscato) Send2MS(ipaddress string, msg MsgUnit) {
255
+	//log.LoadConfiguration("logConfig.json")
248
 	client, err := rpc.Dial("tcp", ipaddress+":8150")
256
 	client, err := rpc.Dial("tcp", ipaddress+":8150")
249
 	if err != nil {
257
 	if err != nil {
250
 		fmt.Println(err)
258
 		fmt.Println(err)
265
 	}
273
 	}
266
 	//log.Println(reply.CompleteLog) //잘 받았는지 확인 해줌
274
 	//log.Println(reply.CompleteLog) //잘 받았는지 확인 해줌
267
 	// 마이크로 서비스에게 받은 메시지는 노란색으로 출력
275
 	// 마이크로 서비스에게 받은 메시지는 노란색으로 출력
268
-	log.Println(reply.CompleteLog)
276
+	//log.Println(reply.CompleteLog)
277
+	l4g.LOGGER("Test").Info(reply.CompleteLog)
269
 }
278
 }
270
 
279
 
271
 func (moscato *Moscato) Run() {
280
 func (moscato *Moscato) Run() {
298
 	//rpc 등록 -> Receive 함수
307
 	//rpc 등록 -> Receive 함수
299
 	err = rpc.Register(receiver)
308
 	err = rpc.Register(receiver)
300
 	if err != nil {
309
 	if err != nil {
301
-		log.Println(err)
310
+		println(err)
302
 		return
311
 		return
303
 	}
312
 	}
304
 
313
 
317
 	l, err1 := net.Listen("tcp", ":8160")
326
 	l, err1 := net.Listen("tcp", ":8160")
318
 
327
 
319
 	if err1 != nil {
328
 	if err1 != nil {
320
-		log.Fatal(fmt.Sprintf("Unable to listen on given port: %s", err1))
329
+		//log.Fatal(fmt.Sprintf("Unable to listen on given port: %s", err1))
330
+		l4g.LOGGER("Test").Critical("Unable to listen on given port: %s", err1)
321
 	}
331
 	}
322
 	defer l.Close()
332
 	defer l.Close()
323
 
333
 

Загрузка…
Отмена
Сохранить