mirror of
https://github.com/duanhf2012/origin.git
synced 2026-02-13 23:24:45 +08:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7f93aa5ff9 | ||
|
|
7a8d312aeb | ||
|
|
f931f61f7b | ||
|
|
151ed123f4 | ||
|
|
5a6a4c8a0d | ||
|
|
280c04a5d7 | ||
|
|
1520dae223 | ||
|
|
84f3429564 | ||
|
|
89fd5d273b | ||
|
|
3ce873ef04 | ||
|
|
3763f7d848 | ||
|
|
769f680b17 | ||
|
|
77988906f8 | ||
|
|
ae0ba1d966 | ||
|
|
f61fd5d1be | ||
|
|
eb1867c5fd | ||
|
|
8823d5fba4 | ||
|
|
9945c29a5c | ||
|
|
173d84f7e6 | ||
|
|
d687780517 | ||
|
|
a8a030c0f5 | ||
|
|
f8469ea10e |
@@ -46,16 +46,18 @@ type Cluster struct {
|
|||||||
globalCfg interface{} //全局配置
|
globalCfg interface{} //全局配置
|
||||||
|
|
||||||
localServiceCfg map[string]interface{} //map[serviceName]配置数据*
|
localServiceCfg map[string]interface{} //map[serviceName]配置数据*
|
||||||
mapRpc map[int]NodeRpcInfo //nodeId
|
|
||||||
serviceDiscovery IServiceDiscovery //服务发现接口
|
serviceDiscovery IServiceDiscovery //服务发现接口
|
||||||
|
|
||||||
|
|
||||||
locker sync.RWMutex //结点与服务关系保护锁
|
locker sync.RWMutex //结点与服务关系保护锁
|
||||||
|
mapRpc map[int]NodeRpcInfo //nodeId
|
||||||
mapIdNode map[int]NodeInfo //map[NodeId]NodeInfo
|
mapIdNode map[int]NodeInfo //map[NodeId]NodeInfo
|
||||||
mapServiceNode map[string]map[int]struct{} //map[serviceName]map[NodeId]
|
mapServiceNode map[string]map[int]struct{} //map[serviceName]map[NodeId]
|
||||||
|
|
||||||
rpcServer rpc.Server
|
rpcServer rpc.Server
|
||||||
rpcEventLocker sync.RWMutex //Rpc事件监听保护锁
|
rpcEventLocker sync.RWMutex //Rpc事件监听保护锁
|
||||||
mapServiceListenRpcEvent map[string]struct{} //ServiceName
|
mapServiceListenRpcEvent map[string]struct{} //ServiceName
|
||||||
|
mapServiceListenDiscoveryEvent map[string]struct{} //ServiceName
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetCluster() *Cluster {
|
func GetCluster() *Cluster {
|
||||||
@@ -94,9 +96,10 @@ func (cls *Cluster) DelNode(nodeId int, immediately bool) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
cls.locker.Lock()
|
cls.locker.Lock()
|
||||||
|
defer cls.locker.Unlock()
|
||||||
|
|
||||||
nodeInfo, ok := cls.mapIdNode[nodeId]
|
nodeInfo, ok := cls.mapIdNode[nodeId]
|
||||||
if ok == false {
|
if ok == false {
|
||||||
cls.locker.Unlock()
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,7 +115,6 @@ func (cls *Cluster) DelNode(nodeId int, immediately bool) {
|
|||||||
if rpc.client.IsConnected() {
|
if rpc.client.IsConnected() {
|
||||||
nodeInfo.status = Discard
|
nodeInfo.status = Discard
|
||||||
rpc.client.Unlock()
|
rpc.client.Unlock()
|
||||||
cls.locker.Unlock()
|
|
||||||
log.SRelease("Discard node ", nodeInfo.NodeId, " ", nodeInfo.ListenAddr)
|
log.SRelease("Discard node ", nodeInfo.NodeId, " ", nodeInfo.ListenAddr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -126,7 +128,6 @@ func (cls *Cluster) DelNode(nodeId int, immediately bool) {
|
|||||||
|
|
||||||
delete(cls.mapIdNode, nodeId)
|
delete(cls.mapIdNode, nodeId)
|
||||||
delete(cls.mapRpc, nodeId)
|
delete(cls.mapRpc, nodeId)
|
||||||
cls.locker.Unlock()
|
|
||||||
if ok == true {
|
if ok == true {
|
||||||
rpc.client.Close(false)
|
rpc.client.Close(false)
|
||||||
}
|
}
|
||||||
@@ -224,6 +225,9 @@ func (cls *Cluster) Init(localNodeId int, setupServiceFun SetupServiceFun) error
|
|||||||
//2.安装服务发现结点
|
//2.安装服务发现结点
|
||||||
cls.SetupServiceDiscovery(localNodeId, setupServiceFun)
|
cls.SetupServiceDiscovery(localNodeId, setupServiceFun)
|
||||||
service.RegRpcEventFun = cls.RegRpcEvent
|
service.RegRpcEventFun = cls.RegRpcEvent
|
||||||
|
service.UnRegRpcEventFun = cls.UnRegRpcEvent
|
||||||
|
service.RegDiscoveryServiceEventFun = cls.RegDiscoveryEvent
|
||||||
|
service.UnRegDiscoveryServiceEventFun = cls.UnReDiscoveryEvent
|
||||||
|
|
||||||
err = cls.serviceDiscovery.InitDiscovery(localNodeId, cls.serviceDiscoveryDelNode, cls.serviceDiscoverySetNodeInfo)
|
err = cls.serviceDiscovery.InitDiscovery(localNodeId, cls.serviceDiscoveryDelNode, cls.serviceDiscoverySetNodeInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -364,6 +368,7 @@ func (cls *Cluster) triggerRpcEvent(bConnect bool, clientSeq uint32, nodeId int)
|
|||||||
cls.locker.Unlock()
|
cls.locker.Unlock()
|
||||||
|
|
||||||
cls.rpcEventLocker.Lock()
|
cls.rpcEventLocker.Lock()
|
||||||
|
defer cls.rpcEventLocker.Unlock()
|
||||||
for serviceName, _ := range cls.mapServiceListenRpcEvent {
|
for serviceName, _ := range cls.mapServiceListenRpcEvent {
|
||||||
ser := service.GetService(serviceName)
|
ser := service.GetService(serviceName)
|
||||||
if ser == nil {
|
if ser == nil {
|
||||||
@@ -376,7 +381,27 @@ func (cls *Cluster) triggerRpcEvent(bConnect bool, clientSeq uint32, nodeId int)
|
|||||||
eventData.NodeId = nodeId
|
eventData.NodeId = nodeId
|
||||||
ser.(service.IModule).NotifyEvent(&eventData)
|
ser.(service.IModule).NotifyEvent(&eventData)
|
||||||
}
|
}
|
||||||
cls.rpcEventLocker.Unlock()
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func (cls *Cluster) TriggerDiscoveryEvent(bDiscovery bool, nodeId int, serviceName []string) {
|
||||||
|
cls.rpcEventLocker.Lock()
|
||||||
|
defer cls.rpcEventLocker.Unlock()
|
||||||
|
|
||||||
|
for sName, _ := range cls.mapServiceListenDiscoveryEvent {
|
||||||
|
ser := service.GetService(sName)
|
||||||
|
if ser == nil {
|
||||||
|
log.SError("cannot find service name ", serviceName)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
var eventData service.DiscoveryServiceEvent
|
||||||
|
eventData.IsDiscovery = bDiscovery
|
||||||
|
eventData.NodeId = nodeId
|
||||||
|
eventData.ServiceName = serviceName
|
||||||
|
ser.(service.IModule).NotifyEvent(&eventData)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cls *Cluster) GetLocalNodeInfo() *NodeInfo {
|
func (cls *Cluster) GetLocalNodeInfo() *NodeInfo {
|
||||||
@@ -399,14 +424,25 @@ func (cls *Cluster) UnRegRpcEvent(serviceName string) {
|
|||||||
cls.rpcEventLocker.Unlock()
|
cls.rpcEventLocker.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cls *Cluster) FetchAllNodeId(fetchFun func(nodeId int)) {
|
|
||||||
cls.locker.Lock()
|
func (cls *Cluster) RegDiscoveryEvent(serviceName string) {
|
||||||
for nodeId, _ := range cls.mapIdNode {
|
cls.rpcEventLocker.Lock()
|
||||||
fetchFun(nodeId)
|
if cls.mapServiceListenDiscoveryEvent == nil {
|
||||||
|
cls.mapServiceListenDiscoveryEvent = map[string]struct{}{}
|
||||||
}
|
}
|
||||||
cls.locker.Unlock()
|
|
||||||
|
cls.mapServiceListenDiscoveryEvent[serviceName] = struct{}{}
|
||||||
|
cls.rpcEventLocker.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (cls *Cluster) UnReDiscoveryEvent(serviceName string) {
|
||||||
|
cls.rpcEventLocker.Lock()
|
||||||
|
delete(cls.mapServiceListenDiscoveryEvent, serviceName)
|
||||||
|
cls.rpcEventLocker.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func HasService(nodeId int, serviceName string) bool {
|
func HasService(nodeId int, serviceName string) bool {
|
||||||
cluster.locker.RLock()
|
cluster.locker.RLock()
|
||||||
defer cluster.locker.RUnlock()
|
defer cluster.locker.RUnlock()
|
||||||
@@ -420,6 +456,32 @@ func HasService(nodeId int, serviceName string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetNodeByServiceName(serviceName string) map[int]struct{} {
|
||||||
|
cluster.locker.RLock()
|
||||||
|
defer cluster.locker.RUnlock()
|
||||||
|
|
||||||
|
mapNode, ok := cluster.mapServiceNode[serviceName]
|
||||||
|
if ok == false {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
mapNodeId := map[int]struct{}{}
|
||||||
|
for nodeId,_ := range mapNode {
|
||||||
|
mapNodeId[nodeId] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
return mapNodeId
|
||||||
|
}
|
||||||
|
|
||||||
func (cls *Cluster) GetGlobalCfg() interface{} {
|
func (cls *Cluster) GetGlobalCfg() interface{} {
|
||||||
return cls.globalCfg
|
return cls.globalCfg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func (cls *Cluster) GetNodeInfo(nodeId int) (NodeInfo,bool) {
|
||||||
|
cls.locker.RLock()
|
||||||
|
defer cls.locker.RUnlock()
|
||||||
|
|
||||||
|
nodeInfo,ok:= cls.mapIdNode[nodeId]
|
||||||
|
return nodeInfo,ok
|
||||||
|
}
|
||||||
|
|||||||
@@ -290,6 +290,8 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
|
|||||||
|
|
||||||
//删除不必要的结点
|
//删除不必要的结点
|
||||||
for _, nodeId := range willDelNodeId {
|
for _, nodeId := range willDelNodeId {
|
||||||
|
nodeInfo,_ := cluster.GetNodeInfo(int(nodeId))
|
||||||
|
cluster.TriggerDiscoveryEvent(false,int(nodeId),nodeInfo.PublicServiceList)
|
||||||
dc.removeMasterNode(req.MasterNodeId, int32(nodeId))
|
dc.removeMasterNode(req.MasterNodeId, int32(nodeId))
|
||||||
if dc.findNodeId(nodeId) == false {
|
if dc.findNodeId(nodeId) == false {
|
||||||
dc.funDelService(int(nodeId), false)
|
dc.funDelService(int(nodeId), false)
|
||||||
@@ -300,6 +302,7 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
|
|||||||
for _, nodeInfo := range mapNodeInfo {
|
for _, nodeInfo := range mapNodeInfo {
|
||||||
dc.addMasterNode(req.MasterNodeId, nodeInfo.NodeId)
|
dc.addMasterNode(req.MasterNodeId, nodeInfo.NodeId)
|
||||||
dc.setNodeInfo(nodeInfo)
|
dc.setNodeInfo(nodeInfo)
|
||||||
|
cluster.TriggerDiscoveryEvent(true,int(nodeInfo.NodeId),nodeInfo.PublicServiceList)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"github.com/duanhf2012/origin/log"
|
"github.com/duanhf2012/origin/log"
|
||||||
"github.com/duanhf2012/origin/rpc"
|
"github.com/duanhf2012/origin/rpc"
|
||||||
jsoniter "github.com/json-iterator/go"
|
jsoniter "github.com/json-iterator/go"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ type NodeInfoList struct {
|
|||||||
|
|
||||||
func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
|
func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
|
||||||
c := &NodeInfoList{}
|
c := &NodeInfoList{}
|
||||||
d, err := ioutil.ReadFile(filepath)
|
d, err := os.ReadFile(filepath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
|
|||||||
func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[int]map[string]interface{}, error) {
|
func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[int]map[string]interface{}, error) {
|
||||||
c := map[string]interface{}{}
|
c := map[string]interface{}{}
|
||||||
//读取配置
|
//读取配置
|
||||||
d, err := ioutil.ReadFile(filepath)
|
d, err := os.ReadFile(filepath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, nil, err
|
return nil, nil, nil, err
|
||||||
}
|
}
|
||||||
@@ -69,7 +69,7 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
|
|||||||
var nodeInfoList []NodeInfo
|
var nodeInfoList []NodeInfo
|
||||||
var masterDiscoverNodeList []NodeInfo
|
var masterDiscoverNodeList []NodeInfo
|
||||||
clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
|
clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
|
||||||
fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
|
fileInfoList, err := os.ReadDir(clusterCfgPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
|
return nil, nil, fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
|
||||||
}
|
}
|
||||||
@@ -111,7 +111,7 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
|
|||||||
|
|
||||||
func (cls *Cluster) readLocalService(localNodeId int) error {
|
func (cls *Cluster) readLocalService(localNodeId int) error {
|
||||||
clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
|
clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
|
||||||
fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
|
fileInfoList, err := os.ReadDir(clusterCfgPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
|
return fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,9 @@ const (
|
|||||||
|
|
||||||
Sys_Event_Tcp EventType = -3
|
Sys_Event_Tcp EventType = -3
|
||||||
Sys_Event_Http_Event EventType = -4
|
Sys_Event_Http_Event EventType = -4
|
||||||
Sys_Event_WebSocket EventType = -5
|
Sys_Event_WebSocket EventType = -5
|
||||||
Sys_Event_Rpc_Event EventType = -6
|
Sys_Event_Node_Event EventType = -6
|
||||||
|
Sys_Event_DiscoverService EventType = -7
|
||||||
|
|
||||||
Sys_Event_User_Define EventType = 1
|
Sys_Event_User_Define EventType = 1
|
||||||
)
|
)
|
||||||
|
|||||||
31
go.mod
31
go.mod
@@ -1,13 +1,30 @@
|
|||||||
module github.com/duanhf2012/origin
|
module github.com/duanhf2012/origin
|
||||||
|
|
||||||
go 1.17
|
go 1.18
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/go-sql-driver/mysql v1.5.0
|
github.com/go-sql-driver/mysql v1.6.0
|
||||||
github.com/golang/protobuf v1.4.3
|
github.com/gogo/protobuf v1.3.2
|
||||||
github.com/gomodule/redigo v1.8.3
|
github.com/gomodule/redigo v1.8.8
|
||||||
github.com/gorilla/websocket v1.4.2
|
github.com/gorilla/websocket v1.5.0
|
||||||
github.com/json-iterator/go v1.1.10
|
github.com/json-iterator/go v1.1.12
|
||||||
google.golang.org/protobuf v1.25.0
|
go.mongodb.org/mongo-driver v1.9.1
|
||||||
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
|
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
|
||||||
)
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/go-stack/stack v1.8.0 // indirect
|
||||||
|
github.com/golang/snappy v0.0.1 // indirect
|
||||||
|
github.com/klauspost/compress v1.13.6 // indirect
|
||||||
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
|
||||||
|
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||||
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
|
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
|
||||||
|
github.com/xdg-go/scram v1.0.2 // indirect
|
||||||
|
github.com/xdg-go/stringprep v1.0.2 // indirect
|
||||||
|
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
|
||||||
|
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
|
||||||
|
golang.org/x/text v0.3.6 // indirect
|
||||||
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
|
)
|
||||||
|
|||||||
159
go.sum
159
go.sum
@@ -1,95 +1,102 @@
|
|||||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
|
||||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
|
||||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
|
||||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
||||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
||||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
|
||||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
github.com/gomodule/redigo v1.8.8 h1:f6cXq6RRfiyrOJEV7p3JhLDlmawGBVBBP1MggY8Mo4E=
|
||||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
github.com/gomodule/redigo v1.8.8/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
|
||||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
|
||||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
|
||||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
|
||||||
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
|
|
||||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
|
||||||
github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc=
|
|
||||||
github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
|
|
||||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
|
||||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
|
|
||||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
|
||||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
|
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||||
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||||
|
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||||
|
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||||
|
github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
|
||||||
|
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
|
||||||
|
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||||
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
|
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||||
|
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
|
||||||
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||||
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
|
||||||
|
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
|
||||||
|
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
|
||||||
|
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
|
||||||
|
github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
|
||||||
|
github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
|
||||||
|
github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
|
||||||
|
github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
|
||||||
|
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
|
||||||
|
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
|
||||||
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
go.mongodb.org/mongo-driver v1.9.1 h1:m078y9v7sBItkt1aaoe2YlvWEXcD263e1a4E1fBrJ1c=
|
||||||
|
go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEtrEA8RH8U8FN1CU7JgqsPU=
|
||||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
|
||||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
|
||||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||||
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
|
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||||
|
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
||||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
|
||||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
|
||||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
|
||||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
|
||||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
|
||||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
|
||||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
|
|
||||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
|
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
|
||||||
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
|
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
|
||||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ type WSClient struct {
|
|||||||
ConnectInterval time.Duration
|
ConnectInterval time.Duration
|
||||||
PendingWriteNum int
|
PendingWriteNum int
|
||||||
MaxMsgLen uint32
|
MaxMsgLen uint32
|
||||||
|
MessageType int
|
||||||
HandshakeTimeout time.Duration
|
HandshakeTimeout time.Duration
|
||||||
AutoReconnect bool
|
AutoReconnect bool
|
||||||
NewAgent func(*WSConn) Agent
|
NewAgent func(*WSConn) Agent
|
||||||
@@ -21,7 +22,7 @@ type WSClient struct {
|
|||||||
cons WebsocketConnSet
|
cons WebsocketConnSet
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
closeFlag bool
|
closeFlag bool
|
||||||
messageType int
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (client *WSClient) Start() {
|
func (client *WSClient) Start() {
|
||||||
@@ -63,7 +64,11 @@ func (client *WSClient) init() {
|
|||||||
if client.cons != nil {
|
if client.cons != nil {
|
||||||
log.SFatal("client is running")
|
log.SFatal("client is running")
|
||||||
}
|
}
|
||||||
client.messageType = websocket.TextMessage
|
|
||||||
|
if client.MessageType == 0 {
|
||||||
|
client.MessageType = websocket.TextMessage
|
||||||
|
}
|
||||||
|
|
||||||
client.cons = make(WebsocketConnSet)
|
client.cons = make(WebsocketConnSet)
|
||||||
client.closeFlag = false
|
client.closeFlag = false
|
||||||
client.dialer = websocket.Dialer{
|
client.dialer = websocket.Dialer{
|
||||||
@@ -84,9 +89,6 @@ func (client *WSClient) dial() *websocket.Conn {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (client *WSClient) SetMessageType(messageType int){
|
|
||||||
client.messageType = messageType
|
|
||||||
}
|
|
||||||
func (client *WSClient) connect() {
|
func (client *WSClient) connect() {
|
||||||
defer client.wg.Done()
|
defer client.wg.Done()
|
||||||
|
|
||||||
@@ -106,7 +108,7 @@ reconnect:
|
|||||||
client.cons[conn] = struct{}{}
|
client.cons[conn] = struct{}{}
|
||||||
client.Unlock()
|
client.Unlock()
|
||||||
|
|
||||||
wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.messageType)
|
wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.MessageType)
|
||||||
agent := client.NewAgent(wsConn)
|
agent := client.NewAgent(wsConn)
|
||||||
agent.Run()
|
agent.Run()
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ type WSServer struct {
|
|||||||
NewAgent func(*WSConn) Agent
|
NewAgent func(*WSConn) Agent
|
||||||
ln net.Listener
|
ln net.Listener
|
||||||
handler *WSHandler
|
handler *WSHandler
|
||||||
messageType int
|
messageType int
|
||||||
}
|
}
|
||||||
|
|
||||||
type WSHandler struct {
|
type WSHandler struct {
|
||||||
@@ -33,10 +33,10 @@ type WSHandler struct {
|
|||||||
conns WebsocketConnSet
|
conns WebsocketConnSet
|
||||||
mutexConns sync.Mutex
|
mutexConns sync.Mutex
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
messageType int
|
messageType int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (handler *WSHandler) SetMessageType(messageType int){
|
func (handler *WSHandler) SetMessageType(messageType int) {
|
||||||
handler.messageType = messageType
|
handler.messageType = messageType
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +51,9 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
conn.SetReadLimit(int64(handler.maxMsgLen))
|
conn.SetReadLimit(int64(handler.maxMsgLen))
|
||||||
handler.messageType = websocket.TextMessage
|
if handler.messageType == 0 {
|
||||||
|
handler.messageType = websocket.TextMessage
|
||||||
|
}
|
||||||
|
|
||||||
handler.wg.Add(1)
|
handler.wg.Add(1)
|
||||||
defer handler.wg.Done()
|
defer handler.wg.Done()
|
||||||
@@ -71,7 +73,7 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
handler.conns[conn] = struct{}{}
|
handler.conns[conn] = struct{}{}
|
||||||
handler.mutexConns.Unlock()
|
handler.mutexConns.Unlock()
|
||||||
|
|
||||||
wsConn := newWSConn(conn, handler.pendingWriteNum, handler.maxMsgLen,handler.messageType)
|
wsConn := newWSConn(conn, handler.pendingWriteNum, handler.maxMsgLen, handler.messageType)
|
||||||
agent := handler.newAgent(wsConn)
|
agent := handler.newAgent(wsConn)
|
||||||
agent.Run()
|
agent.Run()
|
||||||
|
|
||||||
@@ -83,9 +85,9 @@ func (handler *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
agent.OnClose()
|
agent.OnClose()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (server *WSServer) SetMessageType(messageType int){
|
func (server *WSServer) SetMessageType(messageType int) {
|
||||||
server.messageType = messageType
|
server.messageType = messageType
|
||||||
if server.handler!= nil {
|
if server.handler != nil {
|
||||||
server.handler.SetMessageType(messageType)
|
server.handler.SetMessageType(messageType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -137,6 +139,7 @@ func (server *WSServer) Start() {
|
|||||||
maxMsgLen: server.MaxMsgLen,
|
maxMsgLen: server.MaxMsgLen,
|
||||||
newAgent: server.NewAgent,
|
newAgent: server.NewAgent,
|
||||||
conns: make(WebsocketConnSet),
|
conns: make(WebsocketConnSet),
|
||||||
|
messageType:server.messageType,
|
||||||
upgrader: websocket.Upgrader{
|
upgrader: websocket.Upgrader{
|
||||||
HandshakeTimeout: server.HTTPTimeout,
|
HandshakeTimeout: server.HTTPTimeout,
|
||||||
CheckOrigin: func(_ *http.Request) bool { return true },
|
CheckOrigin: func(_ *http.Request) bool { return true },
|
||||||
|
|||||||
160
node/node.go
160
node/node.go
@@ -8,9 +8,9 @@ import (
|
|||||||
"github.com/duanhf2012/origin/log"
|
"github.com/duanhf2012/origin/log"
|
||||||
"github.com/duanhf2012/origin/profiler"
|
"github.com/duanhf2012/origin/profiler"
|
||||||
"github.com/duanhf2012/origin/service"
|
"github.com/duanhf2012/origin/service"
|
||||||
"github.com/duanhf2012/origin/util/timer"
|
|
||||||
"github.com/duanhf2012/origin/util/buildtime"
|
"github.com/duanhf2012/origin/util/buildtime"
|
||||||
"io/ioutil"
|
"github.com/duanhf2012/origin/util/timer"
|
||||||
|
"io"
|
||||||
slog "log"
|
slog "log"
|
||||||
"net/http"
|
"net/http"
|
||||||
_ "net/http/pprof"
|
_ "net/http/pprof"
|
||||||
@@ -31,33 +31,40 @@ var bValid bool
|
|||||||
var configDir = "./config/"
|
var configDir = "./config/"
|
||||||
var logLevel string = "debug"
|
var logLevel string = "debug"
|
||||||
var logPath string
|
var logPath string
|
||||||
|
type BuildOSType = int8
|
||||||
|
|
||||||
|
const(
|
||||||
|
Windows BuildOSType = 0
|
||||||
|
Linux BuildOSType = 1
|
||||||
|
Mac BuildOSType = 2
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
||||||
closeSig = make(chan bool,1)
|
closeSig = make(chan bool, 1)
|
||||||
sig = make(chan os.Signal, 3)
|
sig = make(chan os.Signal, 3)
|
||||||
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM,syscall.Signal(10))
|
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM, syscall.Signal(10))
|
||||||
|
|
||||||
console.RegisterCommandBool("help",false,"<-help> This help.",usage)
|
console.RegisterCommandBool("help", false, "<-help> This help.", usage)
|
||||||
console.RegisterCommandString("name","","<-name nodeName> Node's name.",setName)
|
console.RegisterCommandString("name", "", "<-name nodeName> Node's name.", setName)
|
||||||
console.RegisterCommandString("start","","<-start nodeid=nodeid> Run originserver.",startNode)
|
console.RegisterCommandString("start", "", "<-start nodeid=nodeid> Run originserver.", startNode)
|
||||||
console.RegisterCommandString("stop","","<-stop nodeid=nodeid> Stop originserver process.",stopNode)
|
console.RegisterCommandString("stop", "", "<-stop nodeid=nodeid> Stop originserver process.", stopNode)
|
||||||
console.RegisterCommandString("config","","<-config path> Configuration file path.",setConfigPath)
|
console.RegisterCommandString("config", "", "<-config path> Configuration file path.", setConfigPath)
|
||||||
console.RegisterCommandString("console", "", "<-console true|false> Turn on or off screen log output.", openConsole)
|
console.RegisterCommandString("console", "", "<-console true|false> Turn on or off screen log output.", openConsole)
|
||||||
console.RegisterCommandString("loglevel", "debug", "<-loglevel debug|release|warning|error|fatal> Set loglevel.", setLevel)
|
console.RegisterCommandString("loglevel", "debug", "<-loglevel debug|release|warning|error|fatal> Set loglevel.", setLevel)
|
||||||
console.RegisterCommandString("logpath", "", "<-logpath path> Set log file path.", setLogPath)
|
console.RegisterCommandString("logpath", "", "<-logpath path> Set log file path.", setLogPath)
|
||||||
console.RegisterCommandString("pprof","","<-pprof ip:port> Open performance analysis.",setPprof)
|
console.RegisterCommandString("pprof", "", "<-pprof ip:port> Open performance analysis.", setPprof)
|
||||||
}
|
}
|
||||||
|
|
||||||
func usage(val interface{}) error{
|
func usage(val interface{}) error {
|
||||||
ret := val.(bool)
|
ret := val.(bool)
|
||||||
if ret == false {
|
if ret == false {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(buildtime.GetBuildDateTime())>0 {
|
if len(buildtime.GetBuildDateTime()) > 0 {
|
||||||
fmt.Fprintf(os.Stderr, "Welcome to Origin(build info: %s)\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n",buildtime.GetBuildDateTime())
|
fmt.Fprintf(os.Stderr, "Welcome to Origin(build info: %s)\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n", buildtime.GetBuildDateTime())
|
||||||
}else{
|
} else {
|
||||||
fmt.Fprintf(os.Stderr, "Welcome to Origin\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n")
|
fmt.Fprintf(os.Stderr, "Welcome to Origin\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,28 +78,28 @@ func setName(val interface{}) error {
|
|||||||
|
|
||||||
func setPprof(val interface{}) error {
|
func setPprof(val interface{}) error {
|
||||||
listenAddr := val.(string)
|
listenAddr := val.(string)
|
||||||
if listenAddr==""{
|
if listenAddr == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
go func(){
|
go func() {
|
||||||
err := http.ListenAndServe(listenAddr, nil)
|
err := http.ListenAndServe(listenAddr, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(fmt.Errorf("%+v",err))
|
panic(fmt.Errorf("%+v", err))
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func setConfigPath(val interface{}) error{
|
func setConfigPath(val interface{}) error {
|
||||||
configPath := val.(string)
|
configPath := val.(string)
|
||||||
if configPath==""{
|
if configPath == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
_, err := os.Stat(configPath)
|
_, err := os.Stat(configPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Cannot find file path %s",configPath)
|
return fmt.Errorf("Cannot find file path %s", configPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
cluster.SetConfigDir(configPath)
|
cluster.SetConfigDir(configPath)
|
||||||
@@ -100,16 +107,16 @@ func setConfigPath(val interface{}) error{
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getRunProcessPid(nodeId int) (int,error) {
|
func getRunProcessPid(nodeId int) (int, error) {
|
||||||
f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid",os.Args[0],nodeId), os.O_RDONLY, 0600)
|
f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid", os.Args[0], nodeId), os.O_RDONLY, 0600)
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
if err!= nil {
|
if err != nil {
|
||||||
return 0,err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
pidByte,errs := ioutil.ReadAll(f)
|
pidByte, errs := io.ReadAll(f)
|
||||||
if errs!=nil {
|
if errs != nil {
|
||||||
return 0,errs
|
return 0, errs
|
||||||
}
|
}
|
||||||
|
|
||||||
return strconv.Atoi(string(pidByte))
|
return strconv.Atoi(string(pidByte))
|
||||||
@@ -117,13 +124,13 @@ func getRunProcessPid(nodeId int) (int,error) {
|
|||||||
|
|
||||||
func writeProcessPid(nodeId int) {
|
func writeProcessPid(nodeId int) {
|
||||||
//pid
|
//pid
|
||||||
f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid",os.Args[0],nodeId), os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
|
f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid", os.Args[0], nodeId), os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
} else {
|
} else {
|
||||||
_,err=f.Write([]byte(fmt.Sprintf("%d",os.Getpid())))
|
_, err = f.Write([]byte(fmt.Sprintf("%d", os.Getpid())))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
@@ -135,28 +142,28 @@ func GetNodeId() int {
|
|||||||
return nodeId
|
return nodeId
|
||||||
}
|
}
|
||||||
|
|
||||||
func initNode(id int){
|
func initNode(id int) {
|
||||||
//1.初始化集群
|
//1.初始化集群
|
||||||
nodeId = id
|
nodeId = id
|
||||||
err := cluster.GetCluster().Init(GetNodeId(),Setup)
|
err := cluster.GetCluster().Init(GetNodeId(), Setup)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.SFatal("read system config is error ",err.Error())
|
log.SFatal("read system config is error ", err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
err = initLog()
|
err = initLog()
|
||||||
if err != nil{
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//2.setup service
|
//2.setup service
|
||||||
for _,s := range preSetupService {
|
for _, s := range preSetupService {
|
||||||
//是否配置的service
|
//是否配置的service
|
||||||
if cluster.GetCluster().IsConfigService(s.GetName()) == false {
|
if cluster.GetCluster().IsConfigService(s.GetName()) == false {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
pServiceCfg := cluster.GetCluster().GetServiceCfg(s.GetName())
|
pServiceCfg := cluster.GetCluster().GetServiceCfg(s.GetName())
|
||||||
s.Init(s,cluster.GetRpcClient,cluster.GetRpcServer,pServiceCfg)
|
s.Init(s, cluster.GetRpcClient, cluster.GetRpcServer, pServiceCfg)
|
||||||
|
|
||||||
service.Setup(s)
|
service.Setup(s)
|
||||||
}
|
}
|
||||||
@@ -165,14 +172,14 @@ func initNode(id int){
|
|||||||
service.Init(closeSig)
|
service.Init(closeSig)
|
||||||
}
|
}
|
||||||
|
|
||||||
func initLog() error{
|
func initLog() error {
|
||||||
if logPath == ""{
|
if logPath == "" {
|
||||||
setLogPath("./log")
|
setLogPath("./log")
|
||||||
}
|
}
|
||||||
|
|
||||||
localnodeinfo := cluster.GetCluster().GetLocalNodeInfo()
|
localnodeinfo := cluster.GetCluster().GetLocalNodeInfo()
|
||||||
filepre := fmt.Sprintf("%s_%d_", localnodeinfo.NodeName, localnodeinfo.NodeId)
|
filepre := fmt.Sprintf("%s_%d_", localnodeinfo.NodeName, localnodeinfo.NodeId)
|
||||||
logger,err := log.New(logLevel,logPath,filepre,slog.LstdFlags|slog.Lshortfile,10)
|
logger, err := log.New(logLevel, logPath, filepre, slog.LstdFlags|slog.Lshortfile, 10)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("cannot create log file!\n")
|
fmt.Printf("cannot create log file!\n")
|
||||||
return err
|
return err
|
||||||
@@ -183,8 +190,8 @@ func initLog() error{
|
|||||||
|
|
||||||
func Start() {
|
func Start() {
|
||||||
err := console.Run(os.Args)
|
err := console.Run(os.Args)
|
||||||
if err!=nil {
|
if err != nil {
|
||||||
fmt.Printf("%+v\n",err)
|
fmt.Printf("%+v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -196,19 +203,19 @@ func stopNode(args interface{}) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
sParam := strings.Split(param,"=")
|
sParam := strings.Split(param, "=")
|
||||||
if len(sParam) != 2 {
|
if len(sParam) != 2 {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
if sParam[0]!="nodeid" {
|
if sParam[0] != "nodeid" {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
nodeId,err:= strconv.Atoi(sParam[1])
|
nodeId, err := strconv.Atoi(sParam[1])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
|
|
||||||
processId,err := getRunProcessPid(nodeId)
|
processId, err := getRunProcessPid(nodeId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -217,26 +224,26 @@ func stopNode(args interface{}) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func startNode(args interface{}) error{
|
func startNode(args interface{}) error {
|
||||||
//1.解析参数
|
//1.解析参数
|
||||||
param := args.(string)
|
param := args.(string)
|
||||||
if param == "" {
|
if param == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
sParam := strings.Split(param,"=")
|
sParam := strings.Split(param, "=")
|
||||||
if len(sParam) != 2 {
|
if len(sParam) != 2 {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
if sParam[0]!="nodeid" {
|
if sParam[0] != "nodeid" {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
nodeId,err:= strconv.Atoi(sParam[1])
|
nodeId, err := strconv.Atoi(sParam[1])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("invalid option %s",param)
|
return fmt.Errorf("invalid option %s", param)
|
||||||
}
|
}
|
||||||
|
|
||||||
timer.StartTimer(10*time.Millisecond,1000000)
|
timer.StartTimer(10*time.Millisecond, 1000000)
|
||||||
log.SRelease("Start running server.")
|
log.SRelease("Start running server.")
|
||||||
//2.初始化node
|
//2.初始化node
|
||||||
initNode(nodeId)
|
initNode(nodeId)
|
||||||
@@ -253,7 +260,7 @@ func startNode(args interface{}) error{
|
|||||||
//6.监听程序退出信号&性能报告
|
//6.监听程序退出信号&性能报告
|
||||||
bRun := true
|
bRun := true
|
||||||
var pProfilerTicker *time.Ticker = &time.Ticker{}
|
var pProfilerTicker *time.Ticker = &time.Ticker{}
|
||||||
if profilerInterval>0 {
|
if profilerInterval > 0 {
|
||||||
pProfilerTicker = time.NewTicker(profilerInterval)
|
pProfilerTicker = time.NewTicker(profilerInterval)
|
||||||
}
|
}
|
||||||
for bRun {
|
for bRun {
|
||||||
@@ -261,7 +268,7 @@ func startNode(args interface{}) error{
|
|||||||
case <-sig:
|
case <-sig:
|
||||||
log.SRelease("receipt stop signal.")
|
log.SRelease("receipt stop signal.")
|
||||||
bRun = false
|
bRun = false
|
||||||
case <- pProfilerTicker.C:
|
case <-pProfilerTicker.C:
|
||||||
profiler.Report()
|
profiler.Report()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -274,11 +281,10 @@ func startNode(args interface{}) error{
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Setup(s ...service.IService) {
|
||||||
func Setup(s ...service.IService) {
|
for _, sv := range s {
|
||||||
for _,sv := range s {
|
|
||||||
sv.OnSetup(sv)
|
sv.OnSetup(sv)
|
||||||
preSetupService = append(preSetupService,sv)
|
preSetupService = append(preSetupService, sv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,7 +292,7 @@ func GetService(serviceName string) service.IService {
|
|||||||
return service.GetService(serviceName)
|
return service.GetService(serviceName)
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetConfigDir(configDir string){
|
func SetConfigDir(configDir string) {
|
||||||
configDir = configDir
|
configDir = configDir
|
||||||
cluster.SetConfigDir(configDir)
|
cluster.SetConfigDir(configDir)
|
||||||
}
|
}
|
||||||
@@ -295,58 +301,58 @@ func GetConfigDir() string {
|
|||||||
return configDir
|
return configDir
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetSysLog(strLevel string, pathname string, flag int){
|
func SetSysLog(strLevel string, pathname string, flag int) {
|
||||||
logs,_:= log.New(strLevel,pathname, "", flag,10)
|
logs, _ := log.New(strLevel, pathname, "", flag, 10)
|
||||||
log.Export(logs)
|
log.Export(logs)
|
||||||
}
|
}
|
||||||
|
|
||||||
func OpenProfilerReport(interval time.Duration){
|
func OpenProfilerReport(interval time.Duration) {
|
||||||
profilerInterval = interval
|
profilerInterval = interval
|
||||||
}
|
}
|
||||||
|
|
||||||
func openConsole(args interface{}) error{
|
func openConsole(args interface{}) error {
|
||||||
if args == "" {
|
if args == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
strOpen := strings.ToLower(strings.TrimSpace(args.(string)))
|
strOpen := strings.ToLower(strings.TrimSpace(args.(string)))
|
||||||
if strOpen == "false" {
|
if strOpen == "false" {
|
||||||
log.OpenConsole = false
|
log.OpenConsole = false
|
||||||
}else if strOpen == "true" {
|
} else if strOpen == "true" {
|
||||||
log.OpenConsole = true
|
log.OpenConsole = true
|
||||||
}else{
|
} else {
|
||||||
return errors.New("Parameter console error!")
|
return errors.New("Parameter console error!")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func setLevel(args interface{}) error{
|
func setLevel(args interface{}) error {
|
||||||
if args==""{
|
if args == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logLevel = strings.TrimSpace(args.(string))
|
logLevel = strings.TrimSpace(args.(string))
|
||||||
if logLevel!= "debug" && logLevel!="release"&& logLevel!="warning"&&logLevel!="error"&&logLevel!="fatal" {
|
if logLevel != "debug" && logLevel != "release" && logLevel != "warning" && logLevel != "error" && logLevel != "fatal" {
|
||||||
return errors.New("unknown level: " + logLevel)
|
return errors.New("unknown level: " + logLevel)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func setLogPath(args interface{}) error{
|
func setLogPath(args interface{}) error {
|
||||||
if args == ""{
|
if args == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
logPath = strings.TrimSpace(args.(string))
|
logPath = strings.TrimSpace(args.(string))
|
||||||
dir, err := os.Stat(logPath) //这个文件夹不存在
|
dir, err := os.Stat(logPath) //这个文件夹不存在
|
||||||
if err == nil && dir.IsDir()==false {
|
if err == nil && dir.IsDir() == false {
|
||||||
return errors.New("Not found dir "+logPath)
|
return errors.New("Not found dir " + logPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = os.Mkdir(logPath, os.ModePerm)
|
err = os.Mkdir(logPath, os.ModePerm)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.New("Cannot create dir "+logPath)
|
return errors.New("Cannot create dir " + logPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,3 +15,7 @@ func KillProcess(processId int){
|
|||||||
fmt.Printf("kill processid %d is successful.\n",processId)
|
fmt.Printf("kill processid %d is successful.\n",processId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetBuildOSType() BuildOSType{
|
||||||
|
return Linux
|
||||||
|
}
|
||||||
|
|||||||
@@ -15,3 +15,7 @@ func KillProcess(processId int){
|
|||||||
fmt.Printf("kill processid %d is successful.\n",processId)
|
fmt.Printf("kill processid %d is successful.\n",processId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetBuildOSType() BuildOSType{
|
||||||
|
return Mac
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,4 +4,8 @@ package node
|
|||||||
|
|
||||||
func KillProcess(processId int){
|
func KillProcess(processId int){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetBuildOSType() BuildOSType{
|
||||||
|
return Windows
|
||||||
|
}
|
||||||
|
|||||||
@@ -68,11 +68,16 @@ type RpcHandler struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type TriggerRpcEvent func(bConnect bool, clientSeq uint32, nodeId int)
|
type TriggerRpcEvent func(bConnect bool, clientSeq uint32, nodeId int)
|
||||||
type IRpcListener interface {
|
type INodeListener interface {
|
||||||
OnNodeConnected(nodeId int)
|
OnNodeConnected(nodeId int)
|
||||||
OnNodeDisconnect(nodeId int)
|
OnNodeDisconnect(nodeId int)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type IDiscoveryServiceListener interface {
|
||||||
|
OnDiscoveryService(nodeId int, serviceName []string)
|
||||||
|
OnUnDiscoveryService(nodeId int, serviceName []string)
|
||||||
|
}
|
||||||
|
|
||||||
type IRpcHandler interface {
|
type IRpcHandler interface {
|
||||||
IRpcHandlerChannel
|
IRpcHandlerChannel
|
||||||
GetName() string
|
GetName() string
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ func (server *Server) selfNodeRpcHandlerAsyncGo(client *Client, callerRpcHandler
|
|||||||
pCall.rpcHandler = callerRpcHandler
|
pCall.rpcHandler = callerRpcHandler
|
||||||
pCall.callback = &callback
|
pCall.callback = &callback
|
||||||
pCall.Reply = reply
|
pCall.Reply = reply
|
||||||
|
pCall.ServiceMethod = serviceMethod
|
||||||
client.AddPending(pCall)
|
client.AddPending(pCall)
|
||||||
req.requestHandle = func(Returns interface{}, Err RpcError) {
|
req.requestHandle = func(Returns interface{}, Err RpcError) {
|
||||||
v := client.RemovePending(callSeq)
|
v := client.RemovePending(callSeq)
|
||||||
|
|||||||
@@ -22,18 +22,24 @@ var timerDispatcherLen = 100000
|
|||||||
|
|
||||||
type IService interface {
|
type IService interface {
|
||||||
Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{})
|
Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{})
|
||||||
SetName(serviceName string)
|
Wait()
|
||||||
GetName() string
|
Start()
|
||||||
|
|
||||||
OnSetup(iService IService)
|
OnSetup(iService IService)
|
||||||
OnInit() error
|
OnInit() error
|
||||||
OnStart()
|
OnStart()
|
||||||
OnRelease()
|
OnRelease()
|
||||||
Wait()
|
|
||||||
Start()
|
SetName(serviceName string)
|
||||||
|
GetName() string
|
||||||
GetRpcHandler() rpc.IRpcHandler
|
GetRpcHandler() rpc.IRpcHandler
|
||||||
GetServiceCfg()interface{}
|
GetServiceCfg()interface{}
|
||||||
OpenProfiler()
|
|
||||||
GetProfiler() *profiler.Profiler
|
GetProfiler() *profiler.Profiler
|
||||||
|
GetServiceEventChannelNum() int
|
||||||
|
GetServiceTimerChannelNum() int
|
||||||
|
|
||||||
|
SetEventChannelNum(num int)
|
||||||
|
OpenProfiler()
|
||||||
}
|
}
|
||||||
|
|
||||||
// eventPool的内存池,缓存Event
|
// eventPool的内存池,缓存Event
|
||||||
@@ -52,7 +58,8 @@ type Service struct {
|
|||||||
startStatus bool
|
startStatus bool
|
||||||
eventProcessor event.IEventProcessor
|
eventProcessor event.IEventProcessor
|
||||||
profiler *profiler.Profiler //性能分析器
|
profiler *profiler.Profiler //性能分析器
|
||||||
rpcEventLister rpc.IRpcListener
|
nodeEventLister rpc.INodeListener
|
||||||
|
discoveryServiceLister rpc.IDiscoveryServiceListener
|
||||||
chanEvent chan event.IEvent
|
chanEvent chan event.IEvent
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,6 +69,13 @@ type RpcConnEvent struct{
|
|||||||
NodeId int
|
NodeId int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DiscoveryServiceEvent 发现服务结点
|
||||||
|
type DiscoveryServiceEvent struct{
|
||||||
|
IsDiscovery bool
|
||||||
|
ServiceName []string
|
||||||
|
NodeId int
|
||||||
|
}
|
||||||
|
|
||||||
func SetMaxServiceChannel(maxEventChannel int){
|
func SetMaxServiceChannel(maxEventChannel int){
|
||||||
maxServiceEventChannel = maxEventChannel
|
maxServiceEventChannel = maxEventChannel
|
||||||
eventPool = originSync.NewPoolEx(make(chan originSync.IPoolData, maxServiceEventChannel), func() originSync.IPoolData {
|
eventPool = originSync.NewPoolEx(make(chan originSync.IPoolData, maxServiceEventChannel), func() originSync.IPoolData {
|
||||||
@@ -69,8 +83,12 @@ func SetMaxServiceChannel(maxEventChannel int){
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (rpcEventData *DiscoveryServiceEvent) GetEventType() event.EventType{
|
||||||
|
return event.Sys_Event_DiscoverService
|
||||||
|
}
|
||||||
|
|
||||||
func (rpcEventData *RpcConnEvent) GetEventType() event.EventType{
|
func (rpcEventData *RpcConnEvent) GetEventType() event.EventType{
|
||||||
return event.Sys_Event_Rpc_Event
|
return event.Sys_Event_Node_Event
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) OnSetup(iService IService){
|
func (s *Service) OnSetup(iService IService){
|
||||||
@@ -88,7 +106,10 @@ func (s *Service) OpenProfiler() {
|
|||||||
|
|
||||||
func (s *Service) Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{}) {
|
func (s *Service) Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{}) {
|
||||||
s.dispatcher =timer.NewDispatcher(timerDispatcherLen)
|
s.dispatcher =timer.NewDispatcher(timerDispatcherLen)
|
||||||
s.chanEvent = make(chan event.IEvent,maxServiceEventChannel)
|
if s.chanEvent == nil {
|
||||||
|
s.chanEvent = make(chan event.IEvent,maxServiceEventChannel)
|
||||||
|
}
|
||||||
|
|
||||||
s.rpcHandler.InitRpcHandler(iService.(rpc.IRpcHandler),getClientFun,getServerFun,iService.(rpc.IRpcHandlerChannel))
|
s.rpcHandler.InitRpcHandler(iService.(rpc.IRpcHandler),getClientFun,getServerFun,iService.(rpc.IRpcHandlerChannel))
|
||||||
s.IRpcHandler = &s.rpcHandler
|
s.IRpcHandler = &s.rpcHandler
|
||||||
s.self = iService.(IModule)
|
s.self = iService.(IModule)
|
||||||
@@ -259,24 +280,44 @@ func (s *Service) RegRawRpc(rpcMethodId uint32,rawRpcCB rpc.RawRpcCallBack){
|
|||||||
func (s *Service) OnStart(){
|
func (s *Service) OnStart(){
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) OnRpcEvent(ev event.IEvent){
|
func (s *Service) OnNodeEvent(ev event.IEvent){
|
||||||
event := ev.(*RpcConnEvent)
|
event := ev.(*RpcConnEvent)
|
||||||
if event.IsConnect {
|
if event.IsConnect {
|
||||||
s.rpcEventLister.OnNodeConnected(event.NodeId)
|
s.nodeEventLister.OnNodeConnected(event.NodeId)
|
||||||
}else{
|
}else{
|
||||||
s.rpcEventLister.OnNodeDisconnect(event.NodeId)
|
s.nodeEventLister.OnNodeDisconnect(event.NodeId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) RegRpcListener(rpcEventLister rpc.IRpcListener) {
|
func (s *Service) OnDiscoverServiceEvent(ev event.IEvent){
|
||||||
s.rpcEventLister = rpcEventLister
|
event := ev.(*DiscoveryServiceEvent)
|
||||||
s.RegEventReceiverFunc(event.Sys_Event_Rpc_Event,s.GetEventHandler(),s.OnRpcEvent)
|
if event.IsDiscovery {
|
||||||
|
s.discoveryServiceLister.OnDiscoveryService(event.NodeId,event.ServiceName)
|
||||||
|
}else{
|
||||||
|
s.discoveryServiceLister.OnUnDiscoveryService(event.NodeId,event.ServiceName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) RegRpcListener(rpcEventLister rpc.INodeListener) {
|
||||||
|
s.nodeEventLister = rpcEventLister
|
||||||
|
s.RegEventReceiverFunc(event.Sys_Event_Node_Event,s.GetEventHandler(),s.OnNodeEvent)
|
||||||
RegRpcEventFun(s.GetName())
|
RegRpcEventFun(s.GetName())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) UnRegRpcListener(rpcLister rpc.IRpcListener) {
|
func (s *Service) UnRegRpcListener(rpcLister rpc.INodeListener) {
|
||||||
s.UnRegEventReceiverFunc(event.Sys_Event_Rpc_Event,s.GetEventHandler())
|
s.UnRegEventReceiverFunc(event.Sys_Event_Node_Event,s.GetEventHandler())
|
||||||
RegRpcEventFun(s.GetName())
|
UnRegRpcEventFun(s.GetName())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) RegDiscoverListener(discoveryServiceListener rpc.IDiscoveryServiceListener) {
|
||||||
|
s.discoveryServiceLister = discoveryServiceListener
|
||||||
|
s.RegEventReceiverFunc(event.Sys_Event_DiscoverService,s.GetEventHandler(),s.OnDiscoverServiceEvent)
|
||||||
|
RegDiscoveryServiceEventFun(s.GetName())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) UnRegDiscoverListener(rpcLister rpc.INodeListener) {
|
||||||
|
s.UnRegEventReceiverFunc(event.Sys_Event_DiscoverService,s.GetEventHandler())
|
||||||
|
UnRegDiscoveryServiceEventFun(s.GetName())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -311,6 +352,21 @@ func (s *Service) pushEvent(ev event.IEvent) error{
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) GetServiceEventChannelNum() int{
|
||||||
|
return len(s.chanEvent)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) GetServiceTimerChannelNum() int{
|
||||||
|
return len(s.dispatcher.ChanTimer)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) SetEventChannelNum(num int){
|
||||||
|
if s.chanEvent == nil {
|
||||||
|
s.chanEvent = make(chan event.IEvent,num)
|
||||||
|
}else {
|
||||||
|
panic("this stage cannot be set")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Service) SetGoRoutineNum(goroutineNum int32) bool {
|
func (s *Service) SetGoRoutineNum(goroutineNum int32) bool {
|
||||||
//已经开始状态不允许修改协程数量,打开性能分析器不允许开多线程
|
//已经开始状态不允许修改协程数量,打开性能分析器不允许开多线程
|
||||||
|
|||||||
@@ -5,7 +5,12 @@ var mapServiceName map[string]IService
|
|||||||
var setupServiceList []IService
|
var setupServiceList []IService
|
||||||
|
|
||||||
type RegRpcEventFunType func(serviceName string)
|
type RegRpcEventFunType func(serviceName string)
|
||||||
|
type RegDiscoveryServiceEventFunType func(serviceName string)
|
||||||
var RegRpcEventFun RegRpcEventFunType
|
var RegRpcEventFun RegRpcEventFunType
|
||||||
|
var UnRegRpcEventFun RegRpcEventFunType
|
||||||
|
|
||||||
|
var RegDiscoveryServiceEventFun RegDiscoveryServiceEventFunType
|
||||||
|
var UnRegDiscoveryServiceEventFun RegDiscoveryServiceEventFunType
|
||||||
|
|
||||||
func init(){
|
func init(){
|
||||||
mapServiceName = map[string]IService{}
|
mapServiceName = map[string]IService{}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
@@ -64,7 +64,7 @@ func (m *HttpClientModule) Init(maxpool int, proxyUrl string) {
|
|||||||
Proxy: proxyFun,
|
Proxy: proxyFun,
|
||||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||||
},
|
},
|
||||||
Timeout: 5 * time.Second,
|
Timeout: 5 * time.Second,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ func (m *HttpClientModule) Request(method string, url string, body []byte, heade
|
|||||||
}
|
}
|
||||||
defer rsp.Body.Close()
|
defer rsp.Body.Close()
|
||||||
|
|
||||||
ret.Body, err = ioutil.ReadAll(rsp.Body)
|
ret.Body, err = io.ReadAll(rsp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ret.Err = err
|
ret.Err = err
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"github.com/duanhf2012/origin/util/uuid"
|
"github.com/duanhf2012/origin/util/uuid"
|
||||||
jsoniter "github.com/json-iterator/go"
|
jsoniter "github.com/json-iterator/go"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -17,13 +16,13 @@ import (
|
|||||||
|
|
||||||
var json = jsoniter.ConfigCompatibleWithStandardLibrary
|
var json = jsoniter.ConfigCompatibleWithStandardLibrary
|
||||||
|
|
||||||
var DefaultReadTimeout time.Duration = time.Second*10
|
var DefaultReadTimeout time.Duration = time.Second * 10
|
||||||
var DefaultWriteTimeout time.Duration = time.Second*10
|
var DefaultWriteTimeout time.Duration = time.Second * 10
|
||||||
var DefaultProcessTimeout time.Duration = time.Second*10
|
var DefaultProcessTimeout time.Duration = time.Second * 10
|
||||||
|
|
||||||
//http redirect
|
//http redirect
|
||||||
type HttpRedirectData struct {
|
type HttpRedirectData struct {
|
||||||
Url string
|
Url string
|
||||||
CookieList []*http.Cookie
|
CookieList []*http.Cookie
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ type routerMatchData struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type routerServeFileData struct {
|
type routerServeFileData struct {
|
||||||
matchUrl string
|
matchUrl string
|
||||||
localPath string
|
localPath string
|
||||||
method HTTP_METHOD
|
method HTTP_METHOD
|
||||||
}
|
}
|
||||||
@@ -56,44 +55,43 @@ type IHttpRouter interface {
|
|||||||
|
|
||||||
SetServeFile(method HTTP_METHOD, urlpath string, dirname string) error
|
SetServeFile(method HTTP_METHOD, urlpath string, dirname string) error
|
||||||
SetFormFileKey(formFileKey string)
|
SetFormFileKey(formFileKey string)
|
||||||
GetFormFileKey()string
|
GetFormFileKey() string
|
||||||
AddHttpFiltrate(FiltrateFun HttpFiltrate) bool
|
AddHttpFiltrate(FiltrateFun HttpFiltrate) bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type HttpRouter struct {
|
type HttpRouter struct {
|
||||||
pathRouter map[HTTP_METHOD] map[string] routerMatchData //url地址，对应本service地址
|
pathRouter map[HTTP_METHOD]map[string]routerMatchData //url地址，对应本service地址
|
||||||
serveFileData map[string] *routerServeFileData
|
serveFileData map[string]*routerServeFileData
|
||||||
httpFiltrateList [] HttpFiltrate
|
httpFiltrateList []HttpFiltrate
|
||||||
|
|
||||||
formFileKey string
|
formFileKey string
|
||||||
}
|
}
|
||||||
|
|
||||||
type HttpSession struct {
|
type HttpSession struct {
|
||||||
httpRouter IHttpRouter
|
httpRouter IHttpRouter
|
||||||
r *http.Request
|
r *http.Request
|
||||||
w http.ResponseWriter
|
w http.ResponseWriter
|
||||||
|
|
||||||
//parse result
|
//parse result
|
||||||
mapParam map[string]string
|
mapParam map[string]string
|
||||||
body []byte
|
body []byte
|
||||||
|
|
||||||
//processor result
|
//processor result
|
||||||
statusCode int
|
statusCode int
|
||||||
msg []byte
|
msg []byte
|
||||||
fileData *routerServeFileData
|
fileData *routerServeFileData
|
||||||
redirectData *HttpRedirectData
|
redirectData *HttpRedirectData
|
||||||
sessionDone chan *HttpSession
|
sessionDone chan *HttpSession
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
type HttpService struct {
|
type HttpService struct {
|
||||||
service.Service
|
service.Service
|
||||||
|
|
||||||
httpServer network.HttpServer
|
httpServer network.HttpServer
|
||||||
postAliasUrl map[HTTP_METHOD] map[string]routerMatchData //url地址，对应本service地址
|
postAliasUrl map[HTTP_METHOD]map[string]routerMatchData //url地址，对应本service地址
|
||||||
httpRouter IHttpRouter
|
httpRouter IHttpRouter
|
||||||
listenAddr string
|
listenAddr string
|
||||||
corsHeader *CORSHeader
|
corsHeader *CORSHeader
|
||||||
processTimeout time.Duration
|
processTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,11 +107,11 @@ func (httpService *HttpService) AddFiltrate(FiltrateFun HttpFiltrate) bool {
|
|||||||
|
|
||||||
func NewHttpHttpRouter() IHttpRouter {
|
func NewHttpHttpRouter() IHttpRouter {
|
||||||
httpRouter := &HttpRouter{}
|
httpRouter := &HttpRouter{}
|
||||||
httpRouter.pathRouter =map[HTTP_METHOD] map[string] routerMatchData{}
|
httpRouter.pathRouter = map[HTTP_METHOD]map[string]routerMatchData{}
|
||||||
httpRouter.serveFileData = map[string] *routerServeFileData{}
|
httpRouter.serveFileData = map[string]*routerServeFileData{}
|
||||||
httpRouter.formFileKey = "file"
|
httpRouter.formFileKey = "file"
|
||||||
for i:=METHOD_NONE+1;i<METHOD_INVALID;i++{
|
for i := METHOD_NONE + 1; i < METHOD_INVALID; i++ {
|
||||||
httpRouter.pathRouter[i] = map[string] routerMatchData{}
|
httpRouter.pathRouter[i] = map[string]routerMatchData{}
|
||||||
}
|
}
|
||||||
|
|
||||||
return httpRouter
|
return httpRouter
|
||||||
@@ -137,7 +135,7 @@ func (slf *HttpSession) Query(key string) (string, bool) {
|
|||||||
return ret, ok
|
return ret, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) GetBody() []byte{
|
func (slf *HttpSession) GetBody() []byte {
|
||||||
return slf.body
|
return slf.body
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,19 +143,19 @@ func (slf *HttpSession) GetMethod() HTTP_METHOD {
|
|||||||
return slf.getMethod(slf.r.Method)
|
return slf.getMethod(slf.r.Method)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) GetPath() string{
|
func (slf *HttpSession) GetPath() string {
|
||||||
return strings.Trim(slf.r.URL.Path,"/")
|
return strings.Trim(slf.r.URL.Path, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) SetHeader(key, value string) {
|
func (slf *HttpSession) SetHeader(key, value string) {
|
||||||
slf.w.Header().Set(key,value)
|
slf.w.Header().Set(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) AddHeader(key, value string) {
|
func (slf *HttpSession) AddHeader(key, value string) {
|
||||||
slf.w.Header().Add(key,value)
|
slf.w.Header().Add(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) GetHeader(key string) string{
|
func (slf *HttpSession) GetHeader(key string) string {
|
||||||
return slf.r.Header.Get(key)
|
return slf.r.Header.Get(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,7 +163,7 @@ func (slf *HttpSession) DelHeader(key string) {
|
|||||||
slf.r.Header.Del(key)
|
slf.r.Header.Del(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) WriteStatusCode(statusCode int){
|
func (slf *HttpSession) WriteStatusCode(statusCode int) {
|
||||||
slf.statusCode = statusCode
|
slf.statusCode = statusCode
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +171,7 @@ func (slf *HttpSession) Write(msg []byte) {
|
|||||||
slf.msg = msg
|
slf.msg = msg
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) WriteJsonDone(statusCode int,msgJson interface{}) error {
|
func (slf *HttpSession) WriteJsonDone(statusCode int, msgJson interface{}) error {
|
||||||
msg, err := json.Marshal(msgJson)
|
msg, err := json.Marshal(msgJson)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -187,12 +185,12 @@ func (slf *HttpSession) WriteJsonDone(statusCode int,msgJson interface{}) error
|
|||||||
|
|
||||||
func (slf *HttpSession) flush() {
|
func (slf *HttpSession) flush() {
|
||||||
slf.w.WriteHeader(slf.statusCode)
|
slf.w.WriteHeader(slf.statusCode)
|
||||||
if slf.msg!=nil {
|
if slf.msg != nil {
|
||||||
slf.w.Write(slf.msg)
|
slf.w.Write(slf.msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) Done(){
|
func (slf *HttpSession) Done() {
|
||||||
slf.sessionDone <- slf
|
slf.sessionDone <- slf
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,15 +217,15 @@ func (slf *HttpRouter) analysisRouterUrl(url string) (string, error) {
|
|||||||
return strings.Trim(url, "/"), nil
|
return strings.Trim(url, "/"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpSession) Handle(){
|
func (slf *HttpSession) Handle() {
|
||||||
slf.httpRouter.Router(slf)
|
slf.httpRouter.Router(slf)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpRouter) SetFormFileKey(formFileKey string){
|
func (slf *HttpRouter) SetFormFileKey(formFileKey string) {
|
||||||
slf.formFileKey = formFileKey
|
slf.formFileKey = formFileKey
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpRouter) GetFormFileKey()string{
|
func (slf *HttpRouter) GetFormFileKey() string {
|
||||||
return slf.formFileKey
|
return slf.formFileKey
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -239,19 +237,19 @@ func (slf *HttpRouter) POST(url string, handle HttpHandle) bool {
|
|||||||
return slf.regRouter(METHOD_POST, url, handle)
|
return slf.regRouter(METHOD_POST, url, handle)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpRouter) regRouter(method HTTP_METHOD, url string, handle HttpHandle) bool{
|
func (slf *HttpRouter) regRouter(method HTTP_METHOD, url string, handle HttpHandle) bool {
|
||||||
mapRouter,ok := slf.pathRouter[method]
|
mapRouter, ok := slf.pathRouter[method]
|
||||||
if ok == false{
|
if ok == false {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
mapRouter[strings.Trim(url,"/")] = routerMatchData{httpHandle:handle}
|
mapRouter[strings.Trim(url, "/")] = routerMatchData{httpHandle: handle}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpRouter) Router(session *HttpSession){
|
func (slf *HttpRouter) Router(session *HttpSession) {
|
||||||
if slf.httpFiltrateList!=nil {
|
if slf.httpFiltrateList != nil {
|
||||||
for _,fun := range slf.httpFiltrateList{
|
for _, fun := range slf.httpFiltrateList {
|
||||||
if fun(session) == false {
|
if fun(session) == false {
|
||||||
//session.done()
|
//session.done()
|
||||||
return
|
return
|
||||||
@@ -288,13 +286,13 @@ func (slf *HttpRouter) Router(session *HttpSession){
|
|||||||
session.Done()
|
session.Done()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (httpService *HttpService) HttpEventHandler(ev event.IEvent) {
|
func (httpService *HttpService) HttpEventHandler(ev event.IEvent) {
|
||||||
ev.(*event.Event).Data.(*HttpSession).Handle()
|
ev.(*event.Event).Data.(*HttpSession).Handle()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (httpService *HttpService) SetHttpRouter(httpRouter IHttpRouter,eventHandler event.IEventHandler) {
|
func (httpService *HttpService) SetHttpRouter(httpRouter IHttpRouter, eventHandler event.IEventHandler) {
|
||||||
httpService.httpRouter = httpRouter
|
httpService.httpRouter = httpRouter
|
||||||
httpService.RegEventReceiverFunc(event.Sys_Event_Http_Event,eventHandler, httpService.HttpEventHandler)
|
httpService.RegEventReceiverFunc(event.Sys_Event_Http_Event, eventHandler, httpService.HttpEventHandler)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *HttpRouter) SetServeFile(method HTTP_METHOD, urlpath string, dirname string) error {
|
func (slf *HttpRouter) SetServeFile(method HTTP_METHOD, urlpath string, dirname string) error {
|
||||||
@@ -350,48 +348,48 @@ func (httpService *HttpService) OnInit() error {
|
|||||||
return fmt.Errorf("%s service config is error!", httpService.GetName())
|
return fmt.Errorf("%s service config is error!", httpService.GetName())
|
||||||
}
|
}
|
||||||
tcpCfg := iConfig.(map[string]interface{})
|
tcpCfg := iConfig.(map[string]interface{})
|
||||||
addr,ok := tcpCfg["ListenAddr"]
|
addr, ok := tcpCfg["ListenAddr"]
|
||||||
if ok == false {
|
if ok == false {
|
||||||
return fmt.Errorf("%s service config is error!", httpService.GetName())
|
return fmt.Errorf("%s service config is error!", httpService.GetName())
|
||||||
}
|
}
|
||||||
var readTimeout time.Duration = DefaultReadTimeout
|
var readTimeout time.Duration = DefaultReadTimeout
|
||||||
var writeTimeout time.Duration = DefaultWriteTimeout
|
var writeTimeout time.Duration = DefaultWriteTimeout
|
||||||
|
|
||||||
if cfgRead,ok := tcpCfg["ReadTimeout"];ok == true {
|
if cfgRead, ok := tcpCfg["ReadTimeout"]; ok == true {
|
||||||
readTimeout = time.Duration(cfgRead.(float64))*time.Millisecond
|
readTimeout = time.Duration(cfgRead.(float64)) * time.Millisecond
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfgWrite,ok := tcpCfg["WriteTimeout"];ok == true {
|
if cfgWrite, ok := tcpCfg["WriteTimeout"]; ok == true {
|
||||||
writeTimeout = time.Duration(cfgWrite.(float64))*time.Millisecond
|
writeTimeout = time.Duration(cfgWrite.(float64)) * time.Millisecond
|
||||||
}
|
}
|
||||||
|
|
||||||
httpService.processTimeout = DefaultProcessTimeout
|
httpService.processTimeout = DefaultProcessTimeout
|
||||||
if cfgProcessTimeout,ok := tcpCfg["ProcessTimeout"];ok == true {
|
if cfgProcessTimeout, ok := tcpCfg["ProcessTimeout"]; ok == true {
|
||||||
httpService.processTimeout = time.Duration(cfgProcessTimeout.(float64))*time.Millisecond
|
httpService.processTimeout = time.Duration(cfgProcessTimeout.(float64)) * time.Millisecond
|
||||||
}
|
}
|
||||||
|
|
||||||
httpService.httpServer.Init(addr.(string), httpService, readTimeout, writeTimeout)
|
httpService.httpServer.Init(addr.(string), httpService, readTimeout, writeTimeout)
|
||||||
//Set CAFile
|
//Set CAFile
|
||||||
caFileList,ok := tcpCfg["CAFile"]
|
caFileList, ok := tcpCfg["CAFile"]
|
||||||
if ok == false {
|
if ok == false {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
iCaList := caFileList.([]interface{})
|
iCaList := caFileList.([]interface{})
|
||||||
var caFile [] network.CAFile
|
var caFile []network.CAFile
|
||||||
for _,i := range iCaList {
|
for _, i := range iCaList {
|
||||||
mapCAFile := i.(map[string]interface{})
|
mapCAFile := i.(map[string]interface{})
|
||||||
c,ok := mapCAFile["Certfile"]
|
c, ok := mapCAFile["Certfile"]
|
||||||
if ok == false{
|
if ok == false {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
k,ok := mapCAFile["Keyfile"]
|
k, ok := mapCAFile["Keyfile"]
|
||||||
if ok == false{
|
if ok == false {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.(string)!="" && k.(string)!="" {
|
if c.(string) != "" && k.(string) != "" {
|
||||||
caFile = append(caFile,network.CAFile{
|
caFile = append(caFile, network.CAFile{
|
||||||
CertFile: c.(string),
|
CertFile: c.(string),
|
||||||
Keyfile: k.(string),
|
Keyfile: k.(string),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -405,12 +403,12 @@ func (httpService *HttpService) SetAllowCORS(corsHeader *CORSHeader) {
|
|||||||
httpService.corsHeader = corsHeader
|
httpService.corsHeader = corsHeader
|
||||||
}
|
}
|
||||||
|
|
||||||
func (httpService *HttpService) ProcessFile(session *HttpSession){
|
func (httpService *HttpService) ProcessFile(session *HttpSession) {
|
||||||
uPath := session.r.URL.Path
|
uPath := session.r.URL.Path
|
||||||
idx := strings.Index(uPath, session.fileData.matchUrl)
|
idx := strings.Index(uPath, session.fileData.matchUrl)
|
||||||
subPath := strings.Trim(uPath[idx+len(session.fileData.matchUrl):], "/")
|
subPath := strings.Trim(uPath[idx+len(session.fileData.matchUrl):], "/")
|
||||||
|
|
||||||
destLocalPath := session.fileData.localPath + "/"+subPath
|
destLocalPath := session.fileData.localPath + "/" + subPath
|
||||||
|
|
||||||
switch session.GetMethod() {
|
switch session.GetMethod() {
|
||||||
case METHOD_GET:
|
case METHOD_GET:
|
||||||
@@ -454,29 +452,29 @@ func (httpService *HttpService) ProcessFile(session *HttpSession){
|
|||||||
defer localFd.Close()
|
defer localFd.Close()
|
||||||
io.Copy(localFd, resourceFile)
|
io.Copy(localFd, resourceFile)
|
||||||
session.WriteStatusCode(http.StatusOK)
|
session.WriteStatusCode(http.StatusOK)
|
||||||
session.Write([]byte(uPath+"/"+fileName))
|
session.Write([]byte(uPath + "/" + fileName))
|
||||||
session.flush()
|
session.flush()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAllowCORSHeader() *CORSHeader{
|
func NewAllowCORSHeader() *CORSHeader {
|
||||||
header := &CORSHeader{}
|
header := &CORSHeader{}
|
||||||
header.AllowCORSHeader = map[string][]string{}
|
header.AllowCORSHeader = map[string][]string{}
|
||||||
header.AllowCORSHeader["Access-Control-Allow-Origin"] = []string{"*"}
|
header.AllowCORSHeader["Access-Control-Allow-Origin"] = []string{"*"}
|
||||||
header.AllowCORSHeader["Access-Control-Allow-Methods"] =[]string{ "POST, GET, OPTIONS, PUT, DELETE"}
|
header.AllowCORSHeader["Access-Control-Allow-Methods"] = []string{"POST, GET, OPTIONS, PUT, DELETE"}
|
||||||
header.AllowCORSHeader["Access-Control-Allow-Headers"] = []string{"Content-Type"}
|
header.AllowCORSHeader["Access-Control-Allow-Headers"] = []string{"Content-Type"}
|
||||||
|
|
||||||
return header
|
return header
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *CORSHeader) AddAllowHeader(key string,val string){
|
func (slf *CORSHeader) AddAllowHeader(key string, val string) {
|
||||||
slf.AllowCORSHeader["Access-Control-Allow-Headers"] = append(slf.AllowCORSHeader["Access-Control-Allow-Headers"],fmt.Sprintf("%s,%s",key,val))
|
slf.AllowCORSHeader["Access-Control-Allow-Headers"] = append(slf.AllowCORSHeader["Access-Control-Allow-Headers"], fmt.Sprintf("%s,%s", key, val))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *CORSHeader) copyTo(header http.Header){
|
func (slf *CORSHeader) copyTo(header http.Header) {
|
||||||
for k,v := range slf.AllowCORSHeader{
|
for k, v := range slf.AllowCORSHeader {
|
||||||
for _,val := range v{
|
for _, val := range v {
|
||||||
header.Add(k,val)
|
header.Add(k, val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -491,12 +489,12 @@ func (httpService *HttpService) ServeHTTP(w http.ResponseWriter, r *http.Request
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
session := &HttpSession{sessionDone:make(chan *HttpSession,1),httpRouter:httpService.httpRouter,statusCode:http.StatusOK}
|
session := &HttpSession{sessionDone: make(chan *HttpSession, 1), httpRouter: httpService.httpRouter, statusCode: http.StatusOK}
|
||||||
session.r = r
|
session.r = r
|
||||||
session.w = w
|
session.w = w
|
||||||
|
|
||||||
defer r.Body.Close()
|
defer r.Body.Close()
|
||||||
body, err := ioutil.ReadAll(r.Body)
|
body, err := io.ReadAll(r.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
session.WriteStatusCode(http.StatusGatewayTimeout)
|
session.WriteStatusCode(http.StatusGatewayTimeout)
|
||||||
session.flush()
|
session.flush()
|
||||||
@@ -504,19 +502,19 @@ func (httpService *HttpService) ServeHTTP(w http.ResponseWriter, r *http.Request
|
|||||||
}
|
}
|
||||||
session.body = body
|
session.body = body
|
||||||
|
|
||||||
httpService.GetEventHandler().NotifyEvent(&event.Event{Type:event.Sys_Event_Http_Event,Data:session})
|
httpService.GetEventHandler().NotifyEvent(&event.Event{Type: event.Sys_Event_Http_Event, Data: session})
|
||||||
ticker := time.NewTicker(httpService.processTimeout)
|
ticker := time.NewTicker(httpService.processTimeout)
|
||||||
select {
|
select {
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
session.WriteStatusCode(http.StatusGatewayTimeout)
|
session.WriteStatusCode(http.StatusGatewayTimeout)
|
||||||
session.flush()
|
session.flush()
|
||||||
break
|
break
|
||||||
case <- session.sessionDone:
|
case <-session.sessionDone:
|
||||||
if session.fileData!=nil {
|
if session.fileData != nil {
|
||||||
httpService.ProcessFile(session)
|
httpService.ProcessFile(session)
|
||||||
}else if session.redirectData!=nil {
|
} else if session.redirectData != nil {
|
||||||
session.redirects()
|
session.redirects()
|
||||||
}else{
|
} else {
|
||||||
session.flush()
|
session.flush()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
57
util/algorithms/BiSearch.go
Normal file
57
util/algorithms/BiSearch.go
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
package algorithms
|
||||||
|
|
||||||
|
|
||||||
|
type NumberType interface {
|
||||||
|
int | int8 | int16 | int32 | int64 | string | float32 | float64 | uint | uint8 | uint16 | uint32 | uint64
|
||||||
|
}
|
||||||
|
|
||||||
|
type Element[ValueType NumberType] interface {
|
||||||
|
GetValue() ValueType
|
||||||
|
}
|
||||||
|
|
||||||
|
//BiSearch 二分查找,切片必需有序号。matchUp表示是否向上范围查找。比如：数列10 20 30 ，当value传入25时，返回结果是2,表示落到3的范围
|
||||||
|
func BiSearch[ValueType NumberType, T Element[ValueType]](sElement []T, value ValueType, matchUp int) int {
|
||||||
|
low, high := 0, len(sElement)-1
|
||||||
|
if high == -1 {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
var mid int
|
||||||
|
for low <= high {
|
||||||
|
mid = low + (high-low)>>1
|
||||||
|
if sElement[mid].GetValue() > value {
|
||||||
|
high = mid - 1
|
||||||
|
} else if sElement[mid].GetValue() < value {
|
||||||
|
low = mid + 1
|
||||||
|
} else {
|
||||||
|
return mid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch matchUp {
|
||||||
|
case 1:
|
||||||
|
if (sElement[mid].GetValue()) < value &&
|
||||||
|
(mid+1 < len(sElement)-1) {
|
||||||
|
return mid + 1
|
||||||
|
}
|
||||||
|
return mid
|
||||||
|
case -1:
|
||||||
|
if (sElement[mid].GetValue()) > value {
|
||||||
|
if mid - 1 < 0 {
|
||||||
|
return -1
|
||||||
|
} else {
|
||||||
|
return mid - 1
|
||||||
|
}
|
||||||
|
} else if (sElement[mid].GetValue()) < value {
|
||||||
|
if (mid+1 < len(sElement)-1) {
|
||||||
|
return mid + 1
|
||||||
|
} else {
|
||||||
|
return mid
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return mid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1
|
||||||
|
}
|
||||||
28
util/algorithms/BiSearch_test.go
Normal file
28
util/algorithms/BiSearch_test.go
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
package algorithms
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MyElement struct {
|
||||||
|
Score int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s MyElement) GetValue() int {
|
||||||
|
return s.Score
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_BiSearch(t *testing.T){
|
||||||
|
var schedulePoolCfgList []MyElement = []MyElement{MyElement{10}, MyElement{12}, MyElement{14}, MyElement{16}} //
|
||||||
|
index := BiSearch[int, MyElement](schedulePoolCfgList, 9, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 10, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 11, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 12, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 13, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 14, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 15, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 16, true)
|
||||||
|
index = BiSearch[int, MyElement](schedulePoolCfgList, 17, true)
|
||||||
|
fmt.Println(index)
|
||||||
|
}
|
||||||
61
util/algorithms/BitwiseOperation.go
Normal file
61
util/algorithms/BitwiseOperation.go
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
package algorithms
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
type BitNumber interface {
|
||||||
|
int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr
|
||||||
|
}
|
||||||
|
|
||||||
|
type UnsignedNumber interface {
|
||||||
|
uint | uint8 | uint16 | uint32 | uint64 | uintptr
|
||||||
|
}
|
||||||
|
|
||||||
|
func getBitTagIndex[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) (uintptr, uintptr, bool) {
|
||||||
|
sliceIndex := uintptr(bitPositionIndex) / (8 * unsafe.Sizeof(bitBuff[0]))
|
||||||
|
sliceBitIndex := uintptr(bitPositionIndex) % (8 * unsafe.Sizeof(bitBuff[0]))
|
||||||
|
|
||||||
|
//位index不能越界
|
||||||
|
if uintptr(bitPositionIndex) >= uintptr(len(bitBuff))*unsafe.Sizeof(bitBuff[0])*8 {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
return sliceIndex, sliceBitIndex, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func setBitTagByIndex[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber, setTag bool) bool {
|
||||||
|
sliceIndex, sliceBitIndex, ret := getBitTagIndex(bitBuff, bitPositionIndex)
|
||||||
|
if ret == false {
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
if setTag {
|
||||||
|
bitBuff[sliceIndex] = bitBuff[sliceIndex] | 1<<sliceBitIndex
|
||||||
|
} else {
|
||||||
|
bitBuff[sliceIndex] = bitBuff[sliceIndex] &^ (1 << sliceBitIndex)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) (bool, error) {
|
||||||
|
sliceIndex, sliceBitIndex, ret := getBitTagIndex(bitBuff, bitPositionIndex)
|
||||||
|
if ret == false {
|
||||||
|
return false, errors.New("Invalid parameter")
|
||||||
|
}
|
||||||
|
|
||||||
|
return (bitBuff[sliceIndex] & (1 << sliceBitIndex)) > 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) bool {
|
||||||
|
return setBitTagByIndex(bitBuff, bitPositionIndex, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ClearBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) bool {
|
||||||
|
return setBitTagByIndex(bitBuff, bitPositionIndex, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetBitwiseNum[Number BitNumber](bitBuff []Number) int {
|
||||||
|
return len(bitBuff) * int(unsafe.Sizeof(bitBuff[0])*8)
|
||||||
|
}
|
||||||
37
util/algorithms/BitwiseOperation_test.go
Normal file
37
util/algorithms/BitwiseOperation_test.go
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
package algorithms
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func Test_Bitwise(t *testing.T) {
|
||||||
|
//1.预分配10个byte切片，用于存储位标识
|
||||||
|
byteBuff := make([]byte, 10)
|
||||||
|
|
||||||
|
//2.获取buff总共位数
|
||||||
|
bitNum := GetBitwiseNum(byteBuff)
|
||||||
|
t.Log(bitNum)
|
||||||
|
|
||||||
|
//3..对索引79位打标记，注意是从0开始，79即为最后一个位
|
||||||
|
idx := uint(79)
|
||||||
|
|
||||||
|
//4.对byteBuff索引idx位置打上标记
|
||||||
|
SetBitwiseTag(byteBuff, idx)
|
||||||
|
|
||||||
|
//5.获取索引idx位置标记
|
||||||
|
isTag, ret := GetBitwiseTag(byteBuff, idx)
|
||||||
|
t.Log("set index ", idx, " :", isTag, ret)
|
||||||
|
if isTag != true {
|
||||||
|
t.Fatal("error")
|
||||||
|
}
|
||||||
|
|
||||||
|
//6.清除掉索引idx位标记
|
||||||
|
ClearBitwiseTag(byteBuff, idx)
|
||||||
|
|
||||||
|
//7.获取索引idx位置标记
|
||||||
|
isTag, ret = GetBitwiseTag(byteBuff, idx)
|
||||||
|
t.Log("get index ", idx, " :", isTag, ret)
|
||||||
|
|
||||||
|
if isTag != false {
|
||||||
|
t.Fatal("error")
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -6,10 +6,15 @@ go tool nm ./originserver.exe |grep buildtime
|
|||||||
|
|
||||||
//编译传入编译时间信息
|
//编译传入编译时间信息
|
||||||
go build -ldflags "-X 'github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101'"
|
go build -ldflags "-X 'github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101'"
|
||||||
|
go build -ldflags "-X github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101 -X github.com/duanhf2012/origin/util/buildtime.BuildTag=debug"
|
||||||
*/
|
*/
|
||||||
var BuildTime string
|
var BuildTime string
|
||||||
|
var BuildTag string
|
||||||
|
|
||||||
func GetBuildDateTime() string {
|
func GetBuildDateTime() string {
|
||||||
return BuildTime
|
return BuildTime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetBuildTag() string {
|
||||||
|
return BuildTag
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package coroutine
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/duanhf2012/origin/log"
|
||||||
"reflect"
|
"reflect"
|
||||||
"runtime/debug"
|
"runtime/debug"
|
||||||
)
|
)
|
||||||
@@ -12,10 +13,11 @@ func F(callback interface{},recoverNum int, args ...interface{}) {
|
|||||||
var coreInfo string
|
var coreInfo string
|
||||||
coreInfo = string(debug.Stack())
|
coreInfo = string(debug.Stack())
|
||||||
coreInfo += "\n" + fmt.Sprintf("Core information is %v\n", r)
|
coreInfo += "\n" + fmt.Sprintf("Core information is %v\n", r)
|
||||||
fmt.Print(coreInfo)
|
log.SError(coreInfo)
|
||||||
|
if recoverNum > 0{
|
||||||
if recoverNum==-1 ||recoverNum-1 >= 0 {
|
|
||||||
recoverNum -= 1
|
recoverNum -= 1
|
||||||
|
}
|
||||||
|
if recoverNum == -1 || recoverNum > 0 {
|
||||||
go F(callback,recoverNum, args...)
|
go F(callback,recoverNum, args...)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
78
util/math/math.go
Normal file
78
util/math/math.go
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
package math
|
||||||
|
|
||||||
|
import "github.com/duanhf2012/origin/log"
|
||||||
|
|
||||||
|
type NumberType interface {
|
||||||
|
int | int8 | int16 | int32 | int64 | float32 | float64 | uint | uint8 | uint16 | uint32 | uint64
|
||||||
|
}
|
||||||
|
|
||||||
|
type SignedNumberType interface {
|
||||||
|
int | int8 | int16 | int32 | int64 | float32 | float64
|
||||||
|
}
|
||||||
|
|
||||||
|
type FloatType interface {
|
||||||
|
float32 | float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func Max[NumType NumberType](number1 NumType, number2 NumType) NumType {
|
||||||
|
if number1 > number2 {
|
||||||
|
return number1
|
||||||
|
}
|
||||||
|
|
||||||
|
return number2
|
||||||
|
}
|
||||||
|
|
||||||
|
func Min[NumType NumberType](number1 NumType, number2 NumType) NumType {
|
||||||
|
if number1 < number2 {
|
||||||
|
return number1
|
||||||
|
}
|
||||||
|
|
||||||
|
return number2
|
||||||
|
}
|
||||||
|
|
||||||
|
func Abs[NumType SignedNumberType](Num NumType) NumType {
|
||||||
|
if Num < 0 {
|
||||||
|
return -1 * Num
|
||||||
|
}
|
||||||
|
|
||||||
|
return Num
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func Add[NumType NumberType](number1 NumType, number2 NumType) NumType {
|
||||||
|
ret := number1 + number2
|
||||||
|
if number2> 0 && ret < number1 {
|
||||||
|
log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
|
||||||
|
}else if (number2<0 && ret > number1){
|
||||||
|
log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
func Sub[NumType NumberType](number1 NumType, number2 NumType) NumType {
|
||||||
|
ret := number1 - number2
|
||||||
|
if number2> 0 && ret > number1 {
|
||||||
|
log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
|
||||||
|
}else if (number2<0 && ret < number1){
|
||||||
|
log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func Mul[NumType NumberType](number1 NumType, number2 NumType) NumType {
|
||||||
|
ret := number1 * number2
|
||||||
|
if number1 == 0 || number2 == 0 {
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
if ret / number2 == number1 {
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
167
util/queue/squeue.go
Normal file
167
util/queue/squeue.go
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
package queue
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
这是一个循环队列
|
||||||
|
*/
|
||||||
|
type SQueue[ElementType any] struct {
|
||||||
|
elements []ElementType
|
||||||
|
head int
|
||||||
|
tail int
|
||||||
|
locker sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
//游标,通过该游标获取数据
|
||||||
|
type SCursor[ElementType any] struct {
|
||||||
|
pos int
|
||||||
|
squeue *SQueue[ElementType]
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSQueue[ElementType any](maxElementNum int) *SQueue[ElementType]{
|
||||||
|
queue := &SQueue[ElementType]{}
|
||||||
|
queue.elements = make([]ElementType,maxElementNum+1)
|
||||||
|
|
||||||
|
return queue
|
||||||
|
}
|
||||||
|
|
||||||
|
//游标移动到队首
|
||||||
|
func (s *SCursor[ElementType]) First(){
|
||||||
|
s.squeue.locker.RLock()
|
||||||
|
defer s.squeue.locker.RUnlock()
|
||||||
|
s.pos = s.squeue.head
|
||||||
|
}
|
||||||
|
|
||||||
|
//从当前位置移动游标,注意如果在多协程读或者pop时，可能会导致游标失效
|
||||||
|
func (s *SCursor[ElementType]) Next() (elem ElementType,ret bool){
|
||||||
|
s.squeue.locker.RLock()
|
||||||
|
defer s.squeue.locker.RUnlock()
|
||||||
|
|
||||||
|
if s.pos == s.squeue.tail {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
s.pos++
|
||||||
|
s.pos = (s.pos)%(len(s.squeue.elements))
|
||||||
|
return s.squeue.elements[s.pos],true
|
||||||
|
}
|
||||||
|
|
||||||
|
//获取队列元数个数
|
||||||
|
func (s *SQueue[ElementType]) Len() int {
|
||||||
|
s.locker.RLock()
|
||||||
|
defer s.locker.RUnlock()
|
||||||
|
|
||||||
|
return s.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SQueue[ElementType]) len() int {
|
||||||
|
if s.head <= s.tail {
|
||||||
|
return s.tail - s.head
|
||||||
|
}
|
||||||
|
|
||||||
|
//(len(s.elements)-1-s.head)+(s.tail+1)
|
||||||
|
return len(s.elements)-s.head+s.tail
|
||||||
|
}
|
||||||
|
|
||||||
|
//获取游标，默认是队首
|
||||||
|
func (s *SQueue[ElementType]) GetCursor() (cur SCursor[ElementType]){
|
||||||
|
s.locker.RLock()
|
||||||
|
defer s.locker.RUnlock()
|
||||||
|
|
||||||
|
cur.squeue = s
|
||||||
|
cur.pos = s.head
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//获取指定位置的游标
|
||||||
|
func (s *SQueue[ElementType]) GetPosCursor(pos int) (cur SCursor[ElementType],ret bool){
|
||||||
|
s.locker.RLock()
|
||||||
|
defer s.locker.RUnlock()
|
||||||
|
|
||||||
|
if s.head < s.tail {
|
||||||
|
if pos<=s.head || pos>s.tail{
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = true
|
||||||
|
cur.squeue = s
|
||||||
|
cur.pos = pos
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if pos >s.tail && pos <=s.head {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cur.squeue = s
|
||||||
|
cur.pos = pos
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//从队首移除掉指定数量元素
|
||||||
|
func (s *SQueue[ElementType]) RemoveElement(elementNum int) (removeNum int) {
|
||||||
|
s.locker.Lock()
|
||||||
|
defer s.locker.Unlock()
|
||||||
|
|
||||||
|
lens := s.len()
|
||||||
|
if elementNum > lens{
|
||||||
|
removeNum = lens
|
||||||
|
}else{
|
||||||
|
removeNum = elementNum
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
s.head = (s.head + removeNum)%len(s.elements)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//从队首Pop元素
|
||||||
|
func (s *SQueue[ElementType]) Pop() (elem ElementType,ret bool){
|
||||||
|
s.locker.Lock()
|
||||||
|
defer s.locker.Unlock()
|
||||||
|
|
||||||
|
if s.head == s.tail {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
s.head++
|
||||||
|
s.head = s.head%len(s.elements)
|
||||||
|
return s.elements[s.head],true
|
||||||
|
}
|
||||||
|
|
||||||
|
//从队尾Push数据
|
||||||
|
func (s *SQueue[ElementType]) Push(elem ElementType) bool {
|
||||||
|
s.locker.Lock()
|
||||||
|
defer s.locker.Unlock()
|
||||||
|
|
||||||
|
nextPos := (s.tail+1) % len(s.elements)
|
||||||
|
if nextPos == s.head {
|
||||||
|
//is full
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
s.tail = nextPos
|
||||||
|
s.elements[s.tail] = elem
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
//判断队列是否为空
|
||||||
|
func (s *SQueue[ElementType]) IsEmpty() bool{
|
||||||
|
s.locker.RLock()
|
||||||
|
defer s.locker.RUnlock()
|
||||||
|
|
||||||
|
return s.head == s.tail
|
||||||
|
}
|
||||||
|
|
||||||
|
//判断队列是否已满
|
||||||
|
func (s *SQueue[ElementType]) IsFull() bool{
|
||||||
|
s.locker.RLock()
|
||||||
|
defer s.locker.RUnlock()
|
||||||
|
|
||||||
|
nextPos := (s.tail+1) % len(s.elements)
|
||||||
|
return nextPos == s.head
|
||||||
|
}
|
||||||
|
|
||||||
66
util/queue/syncqueue_test.go
Normal file
66
util/queue/syncqueue_test.go
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
package queue
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_Example(t *testing.T) {
|
||||||
|
//1.创建阶列
|
||||||
|
queue := NewSQueue[int](5)
|
||||||
|
|
||||||
|
//2.判断是否为空
|
||||||
|
t.Log("is empty :", queue.IsEmpty())
|
||||||
|
t.Log("is full :", queue.IsFull())
|
||||||
|
|
||||||
|
//3.游标使用，打印所有数据
|
||||||
|
cursor := queue.GetCursor()
|
||||||
|
cursor.First()
|
||||||
|
for {
|
||||||
|
elem, ret := cursor.Next()
|
||||||
|
if ret == false {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
t.Log("elem:", elem)
|
||||||
|
}
|
||||||
|
|
||||||
|
//4.push数据，塞满队列
|
||||||
|
for i := 0; i < 6; i++ {
|
||||||
|
t.Log("push:", queue.Push(i))
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Log("is empty :", queue.IsEmpty())
|
||||||
|
t.Log("is full :", queue.IsFull())
|
||||||
|
|
||||||
|
//5.使用游标遍历所有数据
|
||||||
|
cursor.First()
|
||||||
|
for {
|
||||||
|
elem, ret := cursor.Next()
|
||||||
|
if ret == false {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
t.Log("elem:", elem)
|
||||||
|
}
|
||||||
|
|
||||||
|
//6.删除2个元素
|
||||||
|
removeNum := queue.RemoveElement(2)
|
||||||
|
t.Log("Remove Num:", removeNum)
|
||||||
|
|
||||||
|
//7.游标遍历
|
||||||
|
cursor.First()
|
||||||
|
for {
|
||||||
|
elem, ret := cursor.Next()
|
||||||
|
if ret == false {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
t.Log("elem:", elem)
|
||||||
|
}
|
||||||
|
|
||||||
|
//8.pop数据所有
|
||||||
|
for i := 0; i < 6; i++ {
|
||||||
|
elem, ret := queue.Pop()
|
||||||
|
t.Log("pop:", elem, "-", ret, " len:", queue.Len())
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Log("is empty :", queue.IsEmpty())
|
||||||
|
t.Log("is full :", queue.IsFull())
|
||||||
|
}
|
||||||
@@ -51,7 +51,6 @@ func NewPool(C chan interface{},New func()interface{}) *Pool{
|
|||||||
func NewPoolEx(C chan IPoolData,New func()IPoolData) *PoolEx{
|
func NewPoolEx(C chan IPoolData,New func()IPoolData) *PoolEx{
|
||||||
var pool PoolEx
|
var pool PoolEx
|
||||||
pool.C = C
|
pool.C = C
|
||||||
//pool.New = New
|
|
||||||
pool.syncPool.New = func() interface{} {
|
pool.syncPool.New = func() interface{} {
|
||||||
return New()
|
return New()
|
||||||
}
|
}
|
||||||
@@ -61,10 +60,18 @@ func NewPoolEx(C chan IPoolData,New func()IPoolData) *PoolEx{
|
|||||||
func (pool *PoolEx) Get() IPoolData{
|
func (pool *PoolEx) Get() IPoolData{
|
||||||
select {
|
select {
|
||||||
case d := <-pool.C:
|
case d := <-pool.C:
|
||||||
|
if d.IsRef() {
|
||||||
|
panic("Pool data is in use.")
|
||||||
|
}
|
||||||
|
|
||||||
d.Ref()
|
d.Ref()
|
||||||
return d
|
return d
|
||||||
default:
|
default:
|
||||||
data := pool.syncPool.Get().(IPoolData)
|
data := pool.syncPool.Get().(IPoolData)
|
||||||
|
if data.IsRef() {
|
||||||
|
panic("Pool data is in use.")
|
||||||
|
}
|
||||||
|
|
||||||
data.Ref()
|
data.Ref()
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
@@ -76,7 +83,10 @@ func (pool *PoolEx) Put(data IPoolData){
|
|||||||
if data.IsRef() == false {
|
if data.IsRef() == false {
|
||||||
panic("Repeatedly freeing memory")
|
panic("Repeatedly freeing memory")
|
||||||
}
|
}
|
||||||
|
//提前解引用，防止递归释放
|
||||||
|
data.UnRef()
|
||||||
data.Reset()
|
data.Reset()
|
||||||
|
//再次解引用，防止Rest时错误标记
|
||||||
data.UnRef()
|
data.UnRef()
|
||||||
select {
|
select {
|
||||||
case pool.C <- data:
|
case pool.C <- data:
|
||||||
|
|||||||
Reference in New Issue
Block a user