升级框架，解决监听端口无法变更问题

agent/api/message.go

@@ -10,7 +10,7 @@ import (
 	"github.com/mylxsw/adanos-alert/rpc/protocol"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/mylxsw/glacier/web"
 )
 
@@ -34,7 +34,7 @@ func (m *MessageController) Register(router *web.Router) {
 }
 
 func (m *MessageController) saveMessage(msgRepo store.MessageStore, commonMessage misc.CommonMessage, ctx web.Context) error {
-	commonMessage.Meta["adanos_agent_version"] = m.cc.MustGet(glacier.VersionKey).(string)
+	commonMessage.Meta["adanos_agent_version"] = m.cc.MustGet(infra.VersionKey).(string)
 	commonMessage.Meta["adanos_agent_ip"] = misc.ServerIP()
 	m.cc.MustResolve(func(db *ledis.DB) {
 		agentID, _ := db.Get([]byte("agent-id"))

agent/api/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/mylxsw/glacier/web"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
@@ -13,7 +13,7 @@ type ServiceProvider struct{}
 
 func (s ServiceProvider) Register(app container.Container) {}
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.WebAppRouter(routers(app.Container()))
 	app.WebAppMuxRouter(func(router *mux.Router) {
 		// prometheus metrics

agent/job/heartbeat.go

@@ -9,7 +9,7 @@ import (
 	"github.com/mylxsw/adanos-alert/rpc/protocol"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 )
 
 func heartbeatJob(cc container.Container, db *ledis.DB, hs protocol.HeartbeatClient) error {
@@ -19,7 +19,7 @@ func heartbeatJob(cc container.Container, db *ledis.DB, hs protocol.HeartbeatCli
 		AgentTs:       time.Now().Unix(),
 		AgentIP:       misc.ServerIP(),
 		AgentID:       string(agentID),
-		ClientVersion: cc.MustGet(glacier.VersionKey).(string),
+		ClientVersion: cc.MustGet(infra.VersionKey).(string),
 	}
 
 	pong, err := hs.Ping(ctx, &pingReq)

agent/job/provider.go

@@ -3,8 +3,8 @@ package job
 import (
 	"github.com/mylxsw/adanos-alert/rpc/protocol"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
 	"github.com/mylxsw/glacier/cron"
+	"github.com/mylxsw/glacier/infra"
 )
 
 type ServiceProvider struct{}
@@ -14,7 +14,7 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(protocol.NewHeartbeatClient)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.Cron(func(cr cron.Manager, cc container.Container) error {
 		cc.Must(cr.Add("sync-message", "@every 5s", messageSyncJob))
 		cc.Must(cr.Add("heartbeat", "@every 10s", heartbeatJob))

agent/store/provider.go

@@ -2,7 +2,7 @@ package store
 
 import (
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 )
 
 type ServiceProvider struct{}
@@ -11,6 +11,6 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(NewMessageStore)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 
 }

api/provider.go

@@ -7,7 +7,7 @@ import (
 	"github.com/mylxsw/adanos-alert/configs"
 	_ "github.com/mylxsw/adanos-alert/docs"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	httpSwagger "github.com/swaggo/http-swagger"
 )
@@ -29,7 +29,7 @@ type ServiceProvider struct{}
 
 func (s ServiceProvider) Register(app container.Container) {}
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.MustResolve(func(conf *configs.Config) {
 		app.WebAppRouter(routers(app.Container()))
 		app.WebAppMuxRouter(func(router *mux.Router) {

cmd/agent/main.go

@@ -20,7 +20,8 @@ import (
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/asteria/writer"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
+	"github.com/mylxsw/glacier/listener"
 	"github.com/mylxsw/glacier/starter/application"
 	"github.com/mylxsw/glacier/web"
 	"github.com/mylxsw/go-toolkit/network"
@@ -53,8 +54,14 @@ func main() {
 		Usage: "本地数据库存储目录",
 		Value: "/tmp/adanos-agent",
 	}))
+	app.AddFlags(altsrc.NewStringFlag(cli.StringFlag{
+		Name:   "listen",
+		Usage:  "listen address",
+		EnvVar: "ADANOS_AGENT_LISTEN_ADDR",
+		Value:  "127.0.0.1:29999",
+	}))
 
-	app.WithHttpServer().TCPListenerAddr("127.0.0.1:29999")
+	app.WithHttpServer(listener.FlagContext("listen"))
 
 	app.BeforeServerStart(func(cc container.Container) error {
 		stackWriter := writer.NewStackWriter()
@@ -71,7 +78,7 @@ func main() {
 	})
 
 	// Config
-	app.Singleton(func(c glacier.FlagContext) *config.Config {
+	app.Singleton(func(c infra.FlagContext) *config.Config {
 		return &config.Config{
 			DataDir:     c.String("data_dir"),
 			ServerAddr:  c.String("server_addr"),

cmd/server/main.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/mylxsw/adanos-alert/rpc"
 	"github.com/mylxsw/asteria/writer"
+	"github.com/mylxsw/glacier/infra"
+	"github.com/mylxsw/glacier/listener"
 
 	"github.com/gorilla/mux"
 	"github.com/mylxsw/adanos-alert/api"
@@ -22,7 +24,6 @@ import (
 	"github.com/mylxsw/asteria/level"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
 	"github.com/mylxsw/glacier/starter/application"
 	"github.com/mylxsw/glacier/web"
 	"github.com/urfave/cli"
@@ -39,7 +40,7 @@ func main() {
 	app.AddFlags(altsrc.NewStringFlag(cli.StringFlag{
 		Name:  "listen",
 		Usage: "http listen addr",
-		Value: "19999",
+		Value: ":19999",
 	}))
 	app.AddFlags(altsrc.NewStringFlag(cli.StringFlag{
 		Name:  "grpc_listen",
@@ -149,7 +150,7 @@ func main() {
 		Usage: "阿里云语音通知模板变量名",
 	}))
 
-	app.WithHttpServer().TCPListenerAddr(":19999")
+	app.WithHttpServer(listener.FlagContext("listen"))
 
 	app.BeforeServerStart(func(cc container.Container) error {
 		stackWriter := writer.NewStackWriter()
@@ -165,7 +166,7 @@ func main() {
 		return nil
 	})
 
-	app.Singleton(func(c glacier.FlagContext) *configs.Config {
+	app.Singleton(func(c infra.FlagContext) *configs.Config {
 		aggregationPeriod, err := time.ParseDuration(c.String("aggregation_period"))
 		if err != nil {
 			log.Warningf("invalid argument [aggregation_period: %s], using default value", c.String("aggregation_period"))

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/mylxsw/asteria v0.0.0-20200709071207-26dd334a6e51
 	github.com/mylxsw/coll v0.0.0-20190810120926-a7a6f0f4bae8
 	github.com/mylxsw/container v0.0.0-20200525090619-01208c02b074
-	github.com/mylxsw/glacier v0.0.0-20200814023904-e2c4a8f9ea69
+	github.com/mylxsw/glacier v0.0.0-20200820103600-705c319bcccc
 	github.com/mylxsw/go-toolkit v0.0.0-20191208081907-50a06279f988
 	github.com/mylxsw/graceful v0.0.0-20200605063420-3c53968cf134
 	github.com/pkg/errors v0.9.1

go.sum

@@ -172,8 +172,8 @@ github.com/mylxsw/container v0.0.0-20191208075953-c8ee6e3238cc h1:xBh4hQSO+fcWa/
 github.com/mylxsw/container v0.0.0-20191208075953-c8ee6e3238cc/go.mod h1:v2QwNL+V2nI1o7naopTXXalpa1Y6b5E8lCwwANiYfyc=
 github.com/mylxsw/container v0.0.0-20200525090619-01208c02b074 h1:8OLLLh/tG7M5kQrkmFIVYFpj2bLUtYZ3q+jp4vcA5gQ=
 github.com/mylxsw/container v0.0.0-20200525090619-01208c02b074/go.mod h1:UDbF8EtqT7jB0yDc6g9u4P8ORvw4RbFot1QputpgR5U=
-github.com/mylxsw/glacier v0.0.0-20200814023904-e2c4a8f9ea69 h1:HV+OSJ0T+L9xtB3WyHj6SDc3TQa2eXgBu1Mx/3gMhLM=
-github.com/mylxsw/glacier v0.0.0-20200814023904-e2c4a8f9ea69/go.mod h1:gR/AjRPG59eaf9O94gcktmuE+cR9F04WzIcPCDVSy2M=
+github.com/mylxsw/glacier v0.0.0-20200820103600-705c319bcccc h1:UZ+X4drqKtDR0/OKxuvz5nzHssurkVkJW2vR1qbfVlY=
+github.com/mylxsw/glacier v0.0.0-20200820103600-705c319bcccc/go.mod h1:gR/AjRPG59eaf9O94gcktmuE+cR9F04WzIcPCDVSy2M=
 github.com/mylxsw/go-toolkit v0.0.0-20191208081907-50a06279f988 h1:eUlVMPyxeWUogeqwAkat6eE+3eY5fjP/UAXyhAf/7Jw=
 github.com/mylxsw/go-toolkit v0.0.0-20191208081907-50a06279f988/go.mod h1:aJAUawotu1IMtEPXInIm6qwiAEIMSGRAMH6otakYCWw=
 github.com/mylxsw/graceful v0.0.0-20200605063420-3c53968cf134 h1:uYT1HZC8kyKGtAR/Los/azrD8uROgkM8HHuhN2bzPmI=

internal/action/provider.go

@@ -5,7 +5,7 @@ import (
 	"github.com/mylxsw/adanos-alert/internal/repository"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/pkg/errors"
 )
 
@@ -15,7 +15,7 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(NewManager)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.MustResolve(func(manager Manager, queueManager queue.Manager) {
 		manager.Register("http", NewHttpAction(manager))
 		manager.Register("dingding", NewDingdingAction(manager))

internal/job/provider.go

@@ -2,16 +2,17 @@ package job
 
 import (
 	"fmt"
+	"os"
+	"sync"
+
 	"github.com/mylxsw/adanos-alert/internal/repository"
 	"github.com/mylxsw/asteria/log"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"os"
-	"sync"
 
 	"github.com/mylxsw/adanos-alert/configs"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
 	"github.com/mylxsw/glacier/cron"
 )
 
@@ -22,7 +23,7 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(NewTrigger)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.Cron(func(cr cron.Manager, cc container.Container) error {
 
 		return cc.Resolve(func(conf *configs.Config, aggregationJob *AggregationJob, alertJob *TriggerJob, lockRepo repository.LockRepo) {

internal/queue/provider.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/mylxsw/adanos-alert/configs"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 )
 
 type ServiceProvider struct{}
@@ -16,11 +16,11 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(NewManager)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 
 }
 
-func (s ServiceProvider) Daemon(ctx context.Context, app glacier.Glacier) {
+func (s ServiceProvider) Daemon(ctx context.Context, app infra.Glacier) {
 	app.MustResolve(func(manager Manager, conf *configs.Config) {
 		var wg sync.WaitGroup
 		wg.Add(conf.QueueWorkerNum)

internal/repository/impl/provider.go

@@ -8,8 +8,8 @@ import (
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/coll"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
 	"github.com/mylxsw/glacier/cron"
+	"github.com/mylxsw/glacier/infra"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@@ -30,7 +30,7 @@ func (s ServiceProvider) Register(app container.Container) {
 	app.MustSingleton(NewAgentRepo)
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.Cron(func(cr cron.Manager, cc container.Container) error {
 		return cc.Resolve(func(kvRepo repository.KVRepo, groupRepo repository.MessageGroupRepo, msgRepo repository.MessageRepo, conf *configs.Config) {
 			_ = cr.Add("kv_repository_gc", "@hourly", func() {

migrate/provider.go

@@ -2,7 +2,7 @@ package migrate
 
 import (
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 )
 
 type ServiceProvider struct {
@@ -11,6 +11,6 @@ type ServiceProvider struct {
 func (s ServiceProvider) Register(app container.Container) {
 }
 
-func (s ServiceProvider) Boot(app glacier.Glacier) {
+func (s ServiceProvider) Boot(app infra.Glacier) {
 	app.MustResolve(initPredefinedTemplates)
 }

rpc/heartbeat.go

@@ -8,7 +8,7 @@ import (
 	"github.com/mylxsw/adanos-alert/rpc/protocol"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 )
 
 // HeartbeatService is a service server for heartbeat
@@ -36,6 +36,6 @@ func (h *HeartbeatService) Ping(ctx context.Context, request *protocol.PingReque
 	})
 	return &protocol.PongResponse{
 		ServerTs:      time.Now().Unix(),
-		ServerVersion: h.cc.MustGet(glacier.VersionKey).(string),
+		ServerVersion: h.cc.MustGet(infra.VersionKey).(string),
 	}, nil
 }

rpc/provider.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mylxsw/adanos-alert/rpc/protocol"
 	"github.com/mylxsw/asteria/log"
 	"github.com/mylxsw/container"
-	"github.com/mylxsw/glacier"
+	"github.com/mylxsw/glacier/infra"
 	"github.com/mylxsw/graceful"
 	"google.golang.org/grpc"
 )
@@ -36,14 +36,14 @@ func (p Provider) Register(app container.Container) {
 
 }
 
-func (p Provider) Boot(app glacier.Glacier) {
+func (p Provider) Boot(app infra.Glacier) {
 	app.MustResolve(func(serv *grpc.Server) {
 		protocol.RegisterMessageServer(serv, NewMessageService(app.Container()))
 		protocol.RegisterHeartbeatServer(serv, NewHeartbeatService(app.Container()))
 	})
 }
 
-func (p Provider) Daemon(_ context.Context, app glacier.Glacier) {
+func (p Provider) Daemon(_ context.Context, app infra.Glacier) {
 	app.MustResolve(func(serv *grpc.Server, conf *configs.Config, gf graceful.Graceful) {
 		listener, err := net.Listen("tcp", conf.GRPCListen)
 		if err != nil {