Skip to content

Commit 5d0edfc

Browse files
MuZhou233MuZhou233
committed
feat: update config
1 parent 464abcc commit 5d0edfc

File tree

18 files changed

+1701
-1857
lines changed

18 files changed

+1701
-1857
lines changed

‎cmd/admin.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,15 @@ func runCmdAdminCreateUser(ctx *cli.Context) error {
6767
stdLogger.Fatalf("Initialize failed: %v", err)
6868
}
6969

70-
var bc conf.Librarian
70+
var bc conf.Config
7171
err = appSettings.LoadConfig(&bc)
7272
if err != nil {
7373
stdLogger.Fatalf("Load config failed: %v", err)
7474
}
75-
digests := genConfigDigest(&bc)
75+
digests := conf.GenConfigDigest(&bc)
7676
app, cleanup, err := wireAdmin(
7777
digests,
78-
bc.GetEnableServiceDiscovery(),
79-
bc.GetServer(),
80-
bc.GetDatabase(),
81-
bc.GetS3(),
82-
bc.GetPorter(),
83-
bc.GetMiner().GetData(),
84-
bc.GetAuth(),
85-
bc.GetMq(),
86-
bc.GetCache(),
87-
bc.GetConsul(),
88-
bc.GetSearch(),
78+
&bc,
8979
appSettings,
9080
)
9181
if err != nil {

‎cmd/admin_wire.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,17 @@ import (
1919
"github.com/tuihub/librarian/internal/lib/libmq"
2020
"github.com/tuihub/librarian/internal/lib/libobserve"
2121
"github.com/tuihub/librarian/internal/lib/libsearch"
22-
"github.com/tuihub/librarian/internal/model"
2322
"github.com/tuihub/librarian/internal/service/supervisor"
2423
)
2524

2625
func wireAdmin(
27-
[]*model.ConfigDigest,
28-
*conf.Librarian_EnableServiceDiscovery,
29-
*conf.SephirahServer,
30-
*conf.Database,
31-
*conf.S3,
32-
*conf.Porter,
33-
*conf.Miner_Data,
34-
*conf.Auth,
35-
*conf.MQ,
36-
*conf.Cache,
37-
*conf.Consul,
38-
*conf.Search,
26+
[]*conf.ConfigDigest,
27+
*conf.Config,
3928
*libapp.Settings,
4029
) (*biztiphereth.Tiphereth, func(), error) {
4130
panic(
4231
wire.Build(
32+
conf.ProviderSet,
4333
data.ProviderSet,
4434
biz.ProviderSet,
4535
client.ProviderSet,

‎cmd/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ func runCmdConfigCheck(ctx *cli.Context) error {
4949
stdLogger.Fatalf("Initialize failed: %v", err)
5050
}
5151

52-
var bc conf.Librarian
52+
var bc conf.Config
5353
err = appSettings.LoadConfig(&bc)
5454
if err != nil {
5555
stdLogger.Fatalf("Load config failed: %v", err)
5656
}
57-
digests := genConfigDigest(&bc)
57+
digests := conf.GenConfigDigest(&bc)
5858
logConfigDigest(digests, stdLogger)
5959
stdLogger.Infof("=== Configuration Check Completed ===")
6060
return nil

‎cmd/serve.go‎

Lines changed: 6 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ import (
1010
"github.com/tuihub/librarian/internal/lib/libobserve"
1111
"github.com/tuihub/librarian/internal/lib/libs3"
1212
"github.com/tuihub/librarian/internal/lib/libzap"
13-
"github.com/tuihub/librarian/internal/model"
1413
"github.com/tuihub/librarian/internal/service/angelaweb"
1514
miner "github.com/tuihub/protos/pkg/librarian/miner/v1"
1615

1716
"github.com/go-kratos/kratos/v2"
1817
"github.com/go-kratos/kratos/v2/transport/grpc"
1918
"github.com/go-kratos/kratos/v2/transport/http"
2019
"github.com/google/wire"
21-
"github.com/samber/lo"
2220
"github.com/urfave/cli/v2"
2321
"go.uber.org/zap"
2422
)
@@ -97,16 +95,16 @@ func runCmdServe(ctx *cli.Context) error {
9795
stdLogger.Fatalf("Initialize failed: %v", err)
9896
}
9997

100-
var bc conf.Librarian
98+
var bc conf.Config
10199
err = appSettings.LoadConfig(&bc)
102100
if err != nil {
103101
stdLogger.Fatalf("Load config failed: %v", err)
104102
}
105-
digests := genConfigDigest(&bc)
103+
digests := conf.GenConfigDigest(&bc)
106104
logConfigDigest(digests, stdLogger)
107105

108106
if bc.GetEnableServiceDiscovery() == nil {
109-
bc.EnableServiceDiscovery = new(conf.Librarian_EnableServiceDiscovery)
107+
bc.EnableServiceDiscovery = new(conf.EnableServiceDiscovery)
110108
}
111109

112110
stdLogger.Infof("=== Initializing ===")
@@ -118,17 +116,7 @@ func runCmdServe(ctx *cli.Context) error {
118116

119117
app, cleanup, err := wireServe(
120118
digests,
121-
bc.GetEnableServiceDiscovery(),
122-
bc.GetServer(),
123-
bc.GetDatabase(),
124-
bc.GetS3(),
125-
bc.GetPorter(),
126-
bc.GetMiner().GetData(),
127-
bc.GetAuth(),
128-
bc.GetMq(),
129-
bc.GetCache(),
130-
bc.GetConsul(),
131-
bc.GetSearch(),
119+
&bc,
132120
appSettings,
133121
)
134122
if err != nil {
@@ -156,7 +144,7 @@ func runCmdServe(ctx *cli.Context) error {
156144
//}
157145

158146
func minerClientSelector(
159-
conf *conf.Librarian_EnableServiceDiscovery,
147+
conf *conf.EnableServiceDiscovery,
160148
c *conf.Consul,
161149
inproc *inprocgrpc.InprocClients,
162150
app *libapp.Settings,
@@ -167,62 +155,7 @@ func minerClientSelector(
167155
return inproc.Miner, nil
168156
}
169157

170-
func genConfigDigest(c *conf.Librarian) []*model.ConfigDigest {
171-
var digests []*model.ConfigDigest
172-
173-
digests = append(digests, &model.ConfigDigest{
174-
Name: "Server gRPC",
175-
Enabled: lo.ToPtr(c.GetServer() != nil && c.GetServer().GetGrpc() != nil),
176-
Driver: nil,
177-
Listen: lo.ToPtr(c.GetServer().GetGrpc().GetAddr()),
178-
})
179-
digests = append(digests, &model.ConfigDigest{
180-
Name: "Server gRPC-Web",
181-
Enabled: lo.ToPtr(c.GetServer() != nil && c.GetServer().GetGrpcWeb() != nil),
182-
Driver: nil,
183-
Listen: lo.ToPtr(c.GetServer().GetGrpcWeb().GetAddr()),
184-
})
185-
digests = append(digests, &model.ConfigDigest{
186-
Name: "DB",
187-
Enabled: lo.ToPtr(c.GetDatabase() != nil && len(c.GetDatabase().GetDriver()) != 0),
188-
Driver: lo.ToPtr(c.GetDatabase().GetDriver()),
189-
Listen: nil,
190-
})
191-
digests = append(digests, &model.ConfigDigest{
192-
Name: "MQ",
193-
Enabled: lo.ToPtr(c.GetMq() != nil && len(c.GetMq().GetDriver()) != 0),
194-
Driver: lo.ToPtr(c.GetMq().GetDriver()),
195-
Listen: nil,
196-
})
197-
digests = append(digests, &model.ConfigDigest{
198-
Name: "Cache",
199-
Enabled: lo.ToPtr(c.GetCache() != nil && len(c.GetCache().GetDriver()) != 0),
200-
Driver: lo.ToPtr(c.GetCache().GetDriver()),
201-
Listen: nil,
202-
})
203-
digests = append(digests, &model.ConfigDigest{
204-
Name: "S3",
205-
Enabled: lo.ToPtr(c.GetS3() != nil && len(c.GetS3().GetDriver()) != 0),
206-
Driver: lo.ToPtr(c.GetS3().GetDriver()),
207-
Listen: nil,
208-
})
209-
digests = append(digests, &model.ConfigDigest{
210-
Name: "Consul",
211-
Enabled: lo.ToPtr(c.GetConsul() != nil && len(c.GetConsul().GetAddr()) != 0),
212-
Driver: nil,
213-
Listen: nil,
214-
})
215-
digests = append(digests, &model.ConfigDigest{
216-
Name: "OTLP",
217-
Enabled: lo.ToPtr(c.GetOtlp() != nil && len(c.GetOtlp().GetProtocol()) != 0),
218-
Driver: nil,
219-
Listen: nil,
220-
})
221-
222-
return digests
223-
}
224-
225-
func logConfigDigest(digests []*model.ConfigDigest, logger *zap.SugaredLogger) {
158+
func logConfigDigest(digests []*conf.ConfigDigest, logger *zap.SugaredLogger) {
226159
for _, d := range digests {
227160
logger.Info(d.String())
228161
}

‎cmd/serve_wire.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/tuihub/librarian/internal/lib/libobserve"
2121
"github.com/tuihub/librarian/internal/lib/libs3"
2222
"github.com/tuihub/librarian/internal/lib/libsearch"
23-
"github.com/tuihub/librarian/internal/model"
2423
"github.com/tuihub/librarian/internal/server"
2524
"github.com/tuihub/librarian/internal/service/angelaweb"
2625
"github.com/tuihub/librarian/internal/service/sentinel"
@@ -32,22 +31,13 @@ import (
3231
)
3332

3433
func wireServe(
35-
[]*model.ConfigDigest,
36-
*conf.Librarian_EnableServiceDiscovery,
37-
*conf.SephirahServer,
38-
*conf.Database,
39-
*conf.S3,
40-
*conf.Porter,
41-
*conf.Miner_Data,
42-
*conf.Auth,
43-
*conf.MQ,
44-
*conf.Cache,
45-
*conf.Consul,
46-
*conf.Search,
34+
[]*conf.ConfigDigest,
35+
*conf.Config,
4736
*libapp.Settings,
4837
) (*kratos.App, func(), error) {
4938
panic(
5039
wire.Build(
40+
conf.ProviderSet,
5141
minerService.ProviderSet,
5242
angelaweb.ProviderSet,
5343
data.ProviderSet,

‎cmd/wire_gen.go‎

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)