mmm-go / go-stash · 提交

转到一个项目

作者 kevin
提交 b1e4b96bce71eb496b428cfaa5e2bc54a5d3a7e9 1 个父辈 0be0b422

update go-zero

内嵌 并排对比
正在显示 4 个修改的文件 包含 5 行增加 和 3 行删除
@@ -10,6 +10,6 @@ require ( @@ -10,6 +10,6 @@ require (
10 github.com/olivere/elastic v6.2.34+incompatible 10 github.com/olivere/elastic v6.2.34+incompatible
11 github.com/stretchr/testify v1.5.1 11 github.com/stretchr/testify v1.5.1
12 github.com/tal-tech/go-queue v1.0.1 12 github.com/tal-tech/go-queue v1.0.1
13 - github.com/tal-tech/go-zero v1.0.13 13 + github.com/tal-tech/go-zero v1.0.14
14 github.com/vjeantet/jodaTime v1.0.0 14 github.com/vjeantet/jodaTime v1.0.0
15 ) 15 )
@@ -233,6 +233,8 @@ github.com/tal-tech/go-zero v1.0.12 h1:ymdKjhNOBaO5Ddqa/XVo4qRwMNsB3LOKWj6UdFJN5 @@ -233,6 +233,8 @@ github.com/tal-tech/go-zero v1.0.12 h1:ymdKjhNOBaO5Ddqa/XVo4qRwMNsB3LOKWj6UdFJN5
233 github.com/tal-tech/go-zero v1.0.12/go.mod h1:y2wBHTkxNJw79K9/wCSeDKzv2pCT6x45oOmXEsJdQK8= 233 github.com/tal-tech/go-zero v1.0.12/go.mod h1:y2wBHTkxNJw79K9/wCSeDKzv2pCT6x45oOmXEsJdQK8=
234 github.com/tal-tech/go-zero v1.0.13 h1:lCVV29Q+k2Wn2Mvebm1HMPZyvLt3OYxo8b9U2W+SRtg= 234 github.com/tal-tech/go-zero v1.0.13 h1:lCVV29Q+k2Wn2Mvebm1HMPZyvLt3OYxo8b9U2W+SRtg=
235 github.com/tal-tech/go-zero v1.0.13/go.mod h1:y2wBHTkxNJw79K9/wCSeDKzv2pCT6x45oOmXEsJdQK8= 235 github.com/tal-tech/go-zero v1.0.13/go.mod h1:y2wBHTkxNJw79K9/wCSeDKzv2pCT6x45oOmXEsJdQK8=
  236 +github.com/tal-tech/go-zero v1.0.14 h1:a8vH2pMCEt+sackLDZEIYL/u7DhRY7SBbN04ATgzUdI=
  237 +github.com/tal-tech/go-zero v1.0.14/go.mod h1:y2wBHTkxNJw79K9/wCSeDKzv2pCT6x45oOmXEsJdQK8=
236 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= 238 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
237 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= 239 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
238 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= 240 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
@@ -19,7 +19,7 @@ type ( @@ -19,7 +19,7 @@ type (
19 Index string 19 Index string
20 DocType string `json:",default=doc"` 20 DocType string `json:",default=doc"`
21 TimeZone string `json:",optional"` 21 TimeZone string `json:",optional"`
22 - MaxChunkBytes int `json:",default=1048576"` 22 + MaxChunkBytes int `json:",default=15728640"` // default 15M
23 Compress bool `json:",default=false"` 23 Compress bool `json:",default=false"`
24 } 24 }
25 25
@@ -23,7 +23,7 @@ func main() { @@ -23,7 +23,7 @@ func main() {
23 23
24 var c config.Config 24 var c config.Config
25 conf.MustLoad(*configFile, &c) 25 conf.MustLoad(*configFile, &c)
26 - proc.SetTimeoutToForceQuit(c.GracePeriod) 26 + proc.SetTimeToForceQuit(c.GracePeriod)
27 27
28 group := service.NewServiceGroup() 28 group := service.NewServiceGroup()
29 defer group.Stop() 29 defer group.Stop()