libf 2 年之前
父節點
當前提交
d0ed873070
共有 3 個文件被更改,包括 14 次插入3 次删除
  1. 1 1
      go.mod
  2. 6 0
      go.sum
  3. 7 2
      odbclient/client.go

+ 1 - 1
go.mod

@@ -35,7 +35,7 @@ require (
 
 
 require (
 require (
 	git.wecise.com/wecise/common v0.0.0-20230614163235-0dc2eb7c9aad
 	git.wecise.com/wecise/common v0.0.0-20230614163235-0dc2eb7c9aad
-	git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be
+	git.wecise.com/wecise/odb-go v0.0.0-20230628024231-87c8ec7c2c80
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gomodule/redigo v1.8.5 // indirect
 	github.com/gomodule/redigo v1.8.5 // indirect

+ 6 - 0
go.sum

@@ -10,6 +10,12 @@ git.wecise.com/wecise/odb-go v0.0.0-20230627130330-91aa59d544cc h1:V4OUvQUs0bcwG
 git.wecise.com/wecise/odb-go v0.0.0-20230627130330-91aa59d544cc/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
 git.wecise.com/wecise/odb-go v0.0.0-20230627130330-91aa59d544cc/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
 git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be h1:oFRxKE5/V7qaWrnuLpa3HJ+ZiEF7JQLlVj9vYiBwrAo=
 git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be h1:oFRxKE5/V7qaWrnuLpa3HJ+ZiEF7JQLlVj9vYiBwrAo=
 git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
 git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
+git.wecise.com/wecise/odb-go v0.0.0-20230628022926-9de27a1bd59b h1:94qa1cXXdEPcLk75JwGr8ZC6PUFSxhej2LmSdfFmSmw=
+git.wecise.com/wecise/odb-go v0.0.0-20230628022926-9de27a1bd59b/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
+git.wecise.com/wecise/odb-go v0.0.0-20230628023658-4768c00407a3 h1:XSfPbVgYVjWSiMAHgmGRXRpPAwBDtzecnQyBc5/fD4g=
+git.wecise.com/wecise/odb-go v0.0.0-20230628023658-4768c00407a3/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
+git.wecise.com/wecise/odb-go v0.0.0-20230628024231-87c8ec7c2c80 h1:qsXD5o9jap+gMN9bgAcdtmBMMEu/OOlphe4l7KVtyuk=
+git.wecise.com/wecise/odb-go v0.0.0-20230628024231-87c8ec7c2c80/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=

+ 7 - 2
odbclient/client.go

@@ -9,6 +9,7 @@ import (
 	ccfg "git.wecise.com/wecise/common/matrix/cfg"
 	ccfg "git.wecise.com/wecise/common/matrix/cfg"
 	clog "git.wecise.com/wecise/common/matrix/logger"
 	clog "git.wecise.com/wecise/common/matrix/logger"
 	"git.wecise.com/wecise/odb-go/odb"
 	"git.wecise.com/wecise/odb-go/odb"
+	"git.wecise.com/wecise/odb-go/odb/eventmsg"
 	"github.com/scylladb/go-set/strset"
 	"github.com/scylladb/go-set/strset"
 )
 )
 
 
@@ -23,7 +24,7 @@ func init() {
 var odbcfg *odb.Config
 var odbcfg *odb.Config
 
 
 func init() {
 func init() {
-	odbpath := cfg.GetStrings("ODBPATH", "127.0.0.1:11001")
+	odbpath := cfg.GetStrings("ODBPATH", "127.0.0.1:11001,47.92.151.165:11001")
 	keyspace := cfg.GetString("KEYSPACE", "oktest")
 	keyspace := cfg.GetString("KEYSPACE", "oktest")
 	poolsize := cfg.GetInt("POOLSIZE", 0)
 	poolsize := cfg.GetInt("POOLSIZE", 0)
 
 
@@ -65,7 +66,11 @@ func Subscribe(client odb.Client, topic string) {
 			}
 			}
 		}()
 		}()
 		for m := range sub.Channel() {
 		for m := range sub.Channel() {
-			log.Info(topic + " received " + m.Payload)
+			oem, err := eventmsg.FromMsgpack([]byte(m.Payload))
+			if err != nil {
+				log.Error(err)
+			}
+			log.Info(topic + " received " + m.Payload + "\n" + oem.YamlString())
 		}
 		}
 	}()
 	}()
 }
 }