Browse Source

fix peer config

pull/350/head
ginuerzh 7 years ago
parent
commit
6ae4d5114e
  1. 6
      cmd/gost/peer.go
  2. 9
      cmd/gost/route.go
  3. 3
      ws.go

6
cmd/gost/peer.go

@ -19,9 +19,9 @@ const (
)
type peerConfig struct {
Strategy string `json:"strategy"`
MaxFails int `json:"max_fails"`
FailTimeout time.Duration `json:"fail_timeout"`
Strategy string `json:"strategy"`
MaxFails int `json:"max_fails"`
FailTimeout time.Duration
period time.Duration // the period for live reloading
Nodes []string `json:"nodes"`
group *gost.NodeGroup

9
cmd/gost/route.go

@ -59,9 +59,12 @@ func (r *route) parseChain() (*gost.Chain, error) {
gost.WithStrategy(gost.NewStrategy(nodes[0].Get("strategy"))),
)
cfg := nodes[0].Get("peer")
f, err := os.Open(cfg)
if err == nil {
if cfg := nodes[0].Get("peer"); cfg != "" {
f, err := os.Open(cfg)
if err != nil {
return nil, err
}
peerCfg := newPeerConfig()
peerCfg.group = ngroup
peerCfg.baseNodes = nodes

3
ws.go

@ -716,6 +716,9 @@ func generateChallengeKey() (string, error) {
return base64.StdEncoding.EncodeToString(p), nil
}
// TODO: due to the concurrency control in the websocket.Conn,
// a data race may be met when using with multiplexing.
// See: https://godoc.org/gopkg.in/gorilla/websocket.v1#hdr-Concurrency
type websocketConn struct {
conn *websocket.Conn
rb []byte

Loading…
Cancel
Save