Merge pull request #18 from pioneerlfn/master

change the manner we get the configure.

Author: greensheng

conf/gbe_config.go

@@ -17,7 +17,6 @@ package conf
 import (
 "encoding/json"
 "io/ioutil"
-"sync"
 )
 
 type GbeConfig struct {
@@ -56,20 +55,16 @@ type RestServerConfig struct {
 Addr string `json:"addr"`
 }
 
-var config GbeConfig
-var configOnce sync.Once
+var Config *GbeConfig
 
-func GetConfig() *GbeConfig {
-configOnce.Do(func() {
-bytes, err := ioutil.ReadFile("conf.json")
-if err != nil {
-panic(err)
-}
-
-err = json.Unmarshal(bytes, &config)
-if err != nil {
-panic(err)
-}
-})
-return &config
+func Init() {
+bytes, err := ioutil.ReadFile("conf.json")
+if err != nil {
+panic(err)
+}
+err = json.Unmarshal(bytes, &Config)
+if err != nil {
+panic(err)
+}
 }
+

go.sum

@@ -188,6 +188,7 @@ github.com/pingcap/kvproto v0.0.0-20190904075355-9a1bd6a31da2 h1:wBORZD4gvEKK0tG
 github.com/pingcap/kvproto v0.0.0-20190904075355-9a1bd6a31da2/go.mod h1:QMdbTAXCHzzygQzqcG9uVUgU2fKeSN1GmfMiykdSzzY=
 github.com/pingcap/parser v0.0.0-20190506092653-e336082eb825 h1:U9Kdnknj4n2v76Mg7wazevZ5N9U1OIaMwSNRVLEcLX0=
 github.com/pingcap/parser v0.0.0-20190506092653-e336082eb825/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA=
+github.com/pingcap/pd v2.1.18+incompatible h1:ytgHQQlEwvuYWN6gKjivUq8QOL7TIeaPfb5kapaaFNo=
 github.com/pingcap/tidb v2.0.11+incompatible h1:Shz+ry1DzQNsPk1QAejnM+5tgjbwZuzPnIER5aCjQ6c=
 github.com/pingcap/tidb v2.0.11+incompatible/go.mod h1:I8C6jrPINP2rrVunTRd7C9fRRhQrtR43S1/CL5ix/yQ=
 github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330 h1:rRMLMjIMFulCX9sGKZ1hoov/iROMsKyC8Snc02nSukw=

main.go

@@ -15,6 +15,9 @@
 package main
 
 import (
+"net/http"
+_ "net/http/pprof"
+
 "github.com/gitbitex/gitbitex-spot/conf"
 "github.com/gitbitex/gitbitex-spot/matching"
 "github.com/gitbitex/gitbitex-spot/models"
@@ -23,12 +26,11 @@ import (
 "github.com/gitbitex/gitbitex-spot/service"
 "github.com/gitbitex/gitbitex-spot/worker"
 "github.com/prometheus/common/log"
-"net/http"
-_ "net/http/pprof"
 )
 
 func main() {
-gbeConfig := conf.GetConfig()
+// gbeConfig := conf.GetConfig()
+conf.Init()
 
 go func() {
 log.Info(http.ListenAndServe("localhost:6060", nil))
@@ -47,9 +49,9 @@ func main() {
 panic(err)
 }
 for _, product := range products {
-worker.NewTickMaker(product.Id, matching.NewKafkaLogReader("tickMaker", product.Id, gbeConfig.Kafka.Brokers)).Start()
-worker.NewFillMaker(matching.NewKafkaLogReader("fillMaker", product.Id, gbeConfig.Kafka.Brokers)).Start()
-worker.NewTradeMaker(matching.NewKafkaLogReader("tradeMaker", product.Id, gbeConfig.Kafka.Brokers)).Start()
+worker.NewTickMaker(product.Id, matching.NewKafkaLogReader("tickMaker", product.Id, conf.Config.Kafka.Brokers)).Start()
+worker.NewFillMaker(matching.NewKafkaLogReader("fillMaker", product.Id, conf.Config.Kafka.Brokers)).Start()
+worker.NewTradeMaker(matching.NewKafkaLogReader("tradeMaker", product.Id, conf.Config.Kafka.Brokers)).Start()
 }
 
 rest.StartServer()

matching/bootstrap.go

@@ -21,16 +21,14 @@ import (
 )
 
 func StartEngine() {
-gbeConfig := conf.GetConfig()
-
 products, err := service.GetProducts()
 if err != nil {
 panic(err)
 }
 for _, product := range products {
-orderReader := NewKafkaOrderReader(product.Id, gbeConfig.Kafka.Brokers)
+orderReader := NewKafkaOrderReader(product.Id, conf.Config.Kafka.Brokers)
 snapshotStore := NewRedisSnapshotStore(product.Id)
-logStore := NewKafkaLogStore(product.Id, gbeConfig.Kafka.Brokers)
+logStore := NewKafkaLogStore(product.Id, conf.Config.Kafka.Brokers)
 matchEngine := NewEngine(product, orderReader, logStore, snapshotStore)
 matchEngine.Start()
 }

matching/redis_snapshot_store.go

@@ -31,11 +31,10 @@ type RedisSnapshotStore struct {
 }
 
 func NewRedisSnapshotStore(productId string) SnapshotStore {
-gbeConfig := conf.GetConfig()
 
 redisClient := redis.NewClient(&redis.Options{
-Addr: gbeConfig.Redis.Addr,
-Password: gbeConfig.Redis.Password,
+Addr: conf.Config.Redis.Addr,
+Password: conf.Config.Redis.Password,
 DB: 0,
 })
 

models/binlog_stream.go

@@ -32,11 +32,9 @@ type BinLogStream struct {
 }
 
 func NewBinLogStream() *BinLogStream {
-gbeConfig := conf.GetConfig()
-
 redisClient := redis.NewClient(&redis.Options{
-Addr: gbeConfig.Redis.Addr,
-Password: gbeConfig.Redis.Password,
+Addr: conf.Config.Redis.Addr,
+Password: conf.Config.Redis.Password,
 DB: 0,
 })
 
@@ -158,16 +156,15 @@ func (s *BinLogStream) getColumnIndexByName(e *canal.RowsEvent, name string) int
 }
 
 func (s *BinLogStream) Start() {
-gbeConfig := conf.GetConfig()
 
 cfg := canal.NewDefaultConfig()
-cfg.Addr = gbeConfig.DataSource.Addr
-cfg.User = gbeConfig.DataSource.User
-cfg.Password = gbeConfig.DataSource.Password
+cfg.Addr = conf.Config.DataSource.Addr
+cfg.User = conf.Config.DataSource.User
+cfg.Password = conf.Config.DataSource.Password
 cfg.Dump.ExecutionPath = ""
-cfg.Dump.TableDB = gbeConfig.DataSource.Database
+cfg.Dump.TableDB = conf.Config.DataSource.Database
 cfg.ParseTime = true
-cfg.IncludeTableRegex = []string{gbeConfig.DataSource.Database + "\\..*"}
+cfg.IncludeTableRegex = []string{conf.Config.DataSource.Database + "\\..*"}
 cfg.ExcludeTableRegex = []string{"mysql\\..*"}
 c, err := canal.NewCanal(cfg)
 if err != nil {

models/mysql/store.go

@@ -50,7 +50,7 @@ func NewStore(db *gorm.DB) *Store {
 }
 
 func initDb() error {
-cfg := conf.GetConfig()
+cfg := conf.Config
 
 url := fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=Local",
 cfg.DataSource.User, cfg.DataSource.Password, cfg.DataSource.Addr, cfg.DataSource.Database)

pushing/bootstrap.go

@@ -22,7 +22,6 @@ import (
 )
 
 func StartServer() {
-gbeConfig := conf.GetConfig()
 
 sub := newSubscription()
 
@@ -33,12 +32,12 @@ func StartServer() {
 panic(err)
 }
 for _, product := range products {
-newTickerStream(product.Id, sub, matching.NewKafkaLogReader("tickerStream", product.Id, gbeConfig.Kafka.Brokers)).Start()
-newMatchStream(product.Id, sub, matching.NewKafkaLogReader("matchStream", product.Id, gbeConfig.Kafka.Brokers)).Start()
-newOrderBookStream(product.Id, sub, matching.NewKafkaLogReader("orderBookStream", product.Id, gbeConfig.Kafka.Brokers)).Start()
+newTickerStream(product.Id, sub, matching.NewKafkaLogReader("tickerStream", product.Id, conf.Config.Kafka.Brokers)).Start()
+newMatchStream(product.Id, sub, matching.NewKafkaLogReader("matchStream", product.Id, conf.Config.Kafka.Brokers)).Start()
+newOrderBookStream(product.Id, sub, matching.NewKafkaLogReader("orderBookStream", product.Id, conf.Config.Kafka.Brokers)).Start()
 }
 
-go NewServer(gbeConfig.PushServer.Addr, gbeConfig.PushServer.Path, sub).Run()
+go NewServer(conf.Config.PushServer.Addr, conf.Config.PushServer.Path, sub).Run()
 
 log.Info("websocket server ok")
 }

pushing/order_book.go

@@ -202,11 +202,10 @@ var onceStore sync.Once
 
 func sharedSnapshotStore() *redisSnapshotStore {
 onceStore.Do(func() {
-gbeConfig := conf.GetConfig()
 
 redisClient := redis.NewClient(&redis.Options{
-Addr: gbeConfig.Redis.Addr,
-Password: gbeConfig.Redis.Password,
+Addr: conf.Config.Redis.Addr,
+Password: conf.Config.Redis.Password,
 DB: 0,
 })
 

pushing/redis_stream.go

@@ -38,11 +38,10 @@ func newRedisStream(sub *subscription) *redisStream {
 }
 
 func (s *redisStream) Start() {
-gbeConfig := conf.GetConfig()
 
 redisClient := redis.NewClient(&redis.Options{
-Addr: gbeConfig.Redis.Addr,
-Password: gbeConfig.Redis.Password,
+Addr: conf.Config.Redis.Addr,
+Password: conf.Config.Redis.Password,
 DB: 0,
 })
 _, err := redisClient.Ping().Result()