From 69267f038f87f411edb92daed0ae67d93ca6c5fd Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期五, 02 八月 2019 10:09:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
discovery/server.go | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/discovery/server.go b/discovery/server.go
index cedfc10..4b37c53 100644
--- a/discovery/server.go
+++ b/discovery/server.go
@@ -1,58 +1,57 @@
package discovery
-import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/gopherdiscovery.git"
- "fmt"
- "time"
- "webserver/extend/logger"
- "github.com/gogo/protobuf/proto"
-)
-
-const (
- Discovery_Server = "tcp://0.0.0.0:40008"
- Discovery_UrlPubSub = "tcp://0.0.0.0:50008"
-)
-
-//鍚姩discovery鐨剆erver
-var discoveryServer *gopherdiscovery.DiscoveryServer
-var dbChangeChan chan *protomsg.DbChangeMessage
-func StartServer() {
- var clients []string
- var err error
- var (
- defaultOpts = gopherdiscovery.Options{
- SurveyTime: 3 * time.Second,
- //RecvDeadline: 3 * time.Second,
- PollTime: 5 * time.Second,
- }
- )
-
- discoveryServer, err = gopherdiscovery.Server(Discovery_Server, Discovery_UrlPubSub, defaultOpts)
-
- logger.Debug("server: ", discoveryServer)
- logger.Debug("err:",err)
- logger.Debug("clients: ",clients)
-
- dbChangeChan = make(chan *protomsg.DbChangeMessage)
-
- for {
- select {
- case dbMsg := <-dbChangeChan:
- publishMessage(dbMsg)
- }
- }
-}
-
-//骞挎挱鏁版嵁搴撴敼鍙樼殑msg
-func publishMessage(msg *protomsg.DbChangeMessage) {
- sendBytes,err := proto.Marshal(msg)
- if err ==nil{
- discoveryServer.PublishMsg(string(sendBytes))
- }
-}
-
-func AddDbMessage(msg *protomsg.DbChangeMessage) {
- fmt.Println("MSG In")
- dbChangeChan<-msg
-}
\ No newline at end of file
+//import (
+// "basic.com/pubsub/protomsg.git"
+// "basic.com/valib/gopherdiscovery.git"
+// "github.com/gogo/protobuf/proto"
+// "time"
+// "webserver/extend/logger"
+//)
+//
+//const (
+// Discovery_Server = "tcp://0.0.0.0:40008"
+// Discovery_UrlPubSub = "tcp://0.0.0.0:50008"
+//)
+//
+////鍚姩discovery鐨剆erver
+//var discoveryServer *gopherdiscovery.DiscoveryServer
+//var dbChangeChan chan *protomsg.EsPersonCacheChange
+//func StartServer() {
+// var clients []string
+// var err error
+// var (
+// defaultOpts = gopherdiscovery.Options{
+// SurveyTime: 3 * time.Second,
+// //RecvDeadline: 3 * time.Second,
+// PollTime: 5 * time.Second,
+// }
+// )
+//
+// discoveryServer, err = gopherdiscovery.Server(Discovery_Server, Discovery_UrlPubSub, defaultOpts)
+//
+// logger.Debug("server: ", discoveryServer)
+// logger.Debug("err:",err)
+// logger.Debug("clients: ",clients)
+//
+// dbChangeChan = make(chan *protomsg.EsPersonCacheChange)
+//
+// for {
+// select {
+// case dbMsg := <-dbChangeChan:
+// publishMessage(dbMsg)
+// }
+// }
+//}
+//
+////骞挎挱鏁版嵁搴撴敼鍙樼殑msg
+//func publishMessage(msg *protomsg.EsPersonCacheChange) {
+// sendBytes,err := proto.Marshal(msg)
+// if err ==nil{
+// discoveryServer.PublishMsg(string(sendBytes))
+// }
+//}
+//
+//func AddDbMessage(msg *protomsg.EsPersonCacheChange) {
+// logger.Debug("MSG EsPersonCacheChange In")
+// dbChangeChan<-msg
+//}
\ No newline at end of file
--
Gitblit v1.8.0