clean up

Author: tsingson

README.md

@@ -81,6 +81,41 @@ goim 是 非常成功的 IM ( 即时消息平台), 依赖项为 kafka ( 消息
 参见 [/goim-usage-cn.md](goim-usage-cn.md) ( chinese )
 
 
+
+为简化配置, 新增 /third-party/ 将 nats / liftbridge / discovery 放在这里, 并加入到 Makefile 中, 可以在本 repo 在编译依赖
+
+
+
+请查看 [/Makefile](/Makefile) , 运行 make 
+
+**编译**
+```
+make setup
+make build
+```
+或者 
+```
+make setup
+make build-mac
+```
+
+**运行**
+```
+make run
+```
+
+
+
+**清除编译**
+
+```
+make clean
+```
+
+
+
+
+
 ____________________
 
 goim v2.0

cmd/nats/comet/main.go

@@ -43,7 +43,7 @@ func main() {
 
 	flag.Parse()
 	var err error
-	cfg, err = conf.Init(confPath)
+	cfg, err = conf.Load(confPath)
 	if err != nil {
 		panic(err)
 	}

cmd/nats/job/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"os"
 	"os/signal"
 	"syscall"
@@ -9,6 +10,7 @@ import (
 
 	"github.com/tsingson/ex-goim/goim-nats/job"
 	"github.com/tsingson/ex-goim/goim-nats/job/conf"
+	"github.com/tsingson/ex-goim/pkg/utils"
 
 	resolver "github.com/tsingson/discovery/naming/grpc"
 	log "github.com/tsingson/zaplogger"
@@ -21,23 +23,14 @@ var (
 
 func main() {
 
-	// path, _ := utils.GetCurrentExecDir()
-	// confPath := path + "/job-config.toml"
-	// flag.Parse()
-	//
-	// cfg, err := conf.Init(confPath)
-	// if err != nil {
-	// 	panic(err)
-	// }
+	path, _ := utils.GetCurrentExecDir()
+	confPath := path + "/job-config.toml"
+	flag.Parse()
 
-	cfg = conf.Default()
-	// env := &conf.Env{
-	// 	Region:    "china",
-	// 	Zone:      "gd",
-	// 	DeployEnv: "dev",
-	// 	Host:      "job",
-	// }
-	// cfg.Env = env
+	cfg, err := conf.Load(confPath)
+	if err != nil {
+		panic(err)
+	}
 
 	log.Infof("goim-job [version: %s env: %+v] start", ver, cfg.Env)
 	// grpc register naming

cmd/nats/logic/main.go

@@ -8,7 +8,6 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/sanity-io/litter"
 	"github.com/tsingson/discovery/naming"
 	resolver "github.com/tsingson/discovery/naming/grpc"
 	"github.com/tsingson/fastx/utils"
@@ -35,14 +34,12 @@ func main() {
 	confPath := path + "/logic-config.toml"
 
 	var err error
-	cfg, err = conf.LoadToml(confPath)
+	cfg, err = conf.Load(confPath)
 
 	if err != nil {
 		panic(err)
 	}
 
-	litter.Dump(cfg)
-
 	{
 		// env := &conf.Env{
 		// 	Region:    "china",

goim-nats/comet/conf/conf.go

@@ -109,8 +109,8 @@ type Whitelist struct {
 	WhiteLog  string
 }
 
-// Init init config.
-func Init(path string) (cfg *Config, err error) {
+// Load init config.
+func Load(path string) (cfg *Config, err error) {
 
 	if len(path) == 0 {
 		return cfg, xerrors.New("config path is nil")

goim-nats/job/conf/conf.go

@@ -3,7 +3,10 @@ package conf
 import (
 	"time"
 
+	"github.com/BurntSushi/toml"
+	"github.com/imdario/mergo"
 	"github.com/tsingson/discovery/naming"
+	"golang.org/x/xerrors"
 
 	xtime "github.com/tsingson/ex-goim/pkg/time"
 )
@@ -107,3 +110,25 @@ func Default() *Config {
 		},
 	}
 }
+
+// Load init config.
+func Load(path string) (cfg *Config, err error) {
+
+	if len(path) == 0 {
+		return cfg, xerrors.New("config path is nil")
+	}
+
+	Conf = Default()
+	cfg = Default()
+
+	_, err = toml.DecodeFile(path, &cfg)
+	if err != nil {
+		return
+	}
+	err = mergo.Merge(&Conf, cfg, mergo.WithOverride)
+	if err != nil {
+		return Conf, err
+	}
+
+	return Conf, nil
+}

goim-nats/logic/conf/conf.go

@@ -4,13 +4,14 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
+	"github.com/imdario/mergo"
 	"github.com/tsingson/discovery/naming"
 	"golang.org/x/xerrors"
 
 	xtime "github.com/tsingson/ex-goim/pkg/time"
 )
 
-// LogicConfig config.
+// Config config.
 type Config struct {
 	Env        *Env
 	Discovery  *naming.Config
@@ -25,6 +26,7 @@ type Config struct {
 	Regions map[string][]string
 }
 
+// LogicConfig as alias of Config
 type LogicConfig = Config
 
 // Env is env config.
@@ -84,6 +86,8 @@ type Nats struct {
 	ChannelID string //  "channel-stream"
 	AckInbox  string // "acks"
 }
+
+// NatsConfig as alias of Nats
 type NatsConfig = Nats
 
 // RPCClient is RPC client config.
@@ -126,30 +130,32 @@ var (
 
 func init() {
 	Conf = Default()
-	// 	var (
-	// 		defHost, _   = os.Hostname()
-	// 		defWeight, _ = strconv.ParseInt(os.Getenv("WEIGHT"), 10, 32)
-	// 	)
-	// 	flag.StringVar(&confPath, "conf", "logic-example.toml", "default config path")
-	// 	flag.StringVar(&region, "region", os.Getenv("REGION"), "avaliable region. or use REGION env variable, value: sh etc.")
-	// 	flag.StringVar(&zone, "zone", os.Getenv("ZONE"), "avaliable zone. or use ZONE env variable, value: sh001/sh002 etc.")
-	// 	flag.StringVar(&deployEnv, "deploy.env", os.Getenv("DEPLOY_ENV"), "deploy env. or use DEPLOY_ENV env variable, value: dev/fat1/uat/pre/prod etc.")
-	// 	flag.StringVar(&host, "host", defHost, "machine hostname. or use default machine hostname.")
-	// 	flag.Int64Var(&weight, "weight", defWeight, "load balancing weight, or use WEIGHT env variable, value: 10 etc.")
+
 }
 
-// Init init config.
-func Init(path string) (cfg *Config, err error) {
+// Load init config.
+func Load(path string) (cfg *Config, err error) {
+
+	if len(path) == 0 {
+		return cfg, xerrors.New("config path is nil")
+	}
+
 	Conf = Default()
-	if len(path) > 0 {
-		_, err = toml.DecodeFile(path, &Conf)
-	} else {
-		_, err = toml.DecodeFile(confPath, &Conf)
+	cfg = Default()
+
+	_, err = toml.DecodeFile(path, &cfg)
+	if err != nil {
+		return
 	}
+	err = mergo.Merge(&Conf, cfg, mergo.WithOverride)
+	if err != nil {
+		return Conf, err
+	}
+
 	return Conf, nil
 }
 
-// Init init config.
+// LoadToml init config.
 func LoadToml(path string) (cfg *Config, err error) {
 	Conf = Default()
 	if len(path) == 0 {

third-party/discoveryd/init.go

@@ -5,14 +5,14 @@ import (
 
 	"github.com/spf13/afero"
 
-config 	"github.com/tsingson/discovery/conf"
+	config "github.com/tsingson/discovery/conf"
 )
 
 var ( // global variable
 	// cacheSize                int
 	// cacheTimeOut             int64
 	path, logPath string
-	cfg  *config.Config
+	cfg           *config.Config
 )
 
 func init() {

third-party/discoveryd/main.go

@@ -20,7 +20,6 @@ func main() {
 	runtime.MemProfileRate = 0
 	runtime.GOMAXPROCS(128)
 
-
 	/**
 	tw = timingwheel.NewTimingWheel(time.Minute, 60)
 	tw.StartCron()
@@ -50,7 +49,7 @@ func main() {
 
 	svr, cancel := discovery.New(cfg)
 
-	 http.Init(cfg, svr)
+	http.Init(cfg, svr)
 
 	// if err != nil {
 	// 	cancel()

third-party/gnatsd/main.go

@@ -25,7 +25,7 @@ func main() {
 	runtime.MemProfileRate = 0
 	runtime.GOMAXPROCS(128)
 	signal := make(chan struct{})
-	s:= RunDefaultServer()
+	s := RunDefaultServer()
 	s.Start()
 	defer s.Shutdown()
 	<-signal