zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor to shorter config name (#997)

Browse Source
This commit is contained in:
Kevin Wan
2021-09-05 22:43:15 +08:00
committed by GitHub
parent 3b683fd498
commit 79eab0ea2f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/service/serviceconf.go
View File

@@ -25,12 +25,12 @@ const (
// A ServiceConf is a service config. // A ServiceConf is a service config.
type ServiceConf struct { type ServiceConf struct {
Name string Name string
Log logx.LogConf Log logx.LogConf
Mode string `json:",default=pro,options=dev|test|rt|pre|pro"` Mode string `json:",default=pro,options=dev|test|rt|pre|pro"`
MetricsUrl string `json:",optional"` MetricsUrl string `json:",optional"`
Prometheus prometheus.Config `json:",optional"` Prometheus prometheus.Config `json:",optional"`
OpenTelemetry opentelemetry.Config `json:",optional"` Telemetry opentelemetry.Config `json:",optional"`
} }
// MustSetUp sets up the service, exits on error. // MustSetUp sets up the service, exits on error.
@@ -45,8 +45,8 @@ func (sc ServiceConf) SetUp() error {
if len(sc.Log.ServiceName) == 0 { if len(sc.Log.ServiceName) == 0 {
sc.Log.ServiceName = sc.Name sc.Log.ServiceName = sc.Name
} }
if len(sc.OpenTelemetry.Name) == 0 { if len(sc.Telemetry.Name) == 0 {
sc.OpenTelemetry.Name = sc.Name sc.Telemetry.Name = sc.Name
} }
if err := logx.SetUp(sc.Log); err != nil { if err := logx.SetUp(sc.Log); err != nil {
return err return err
@@ -54,7 +54,7 @@ func (sc ServiceConf) SetUp() error {
sc.initMode() sc.initMode()
prometheus.StartAgent(sc.Prometheus) prometheus.StartAgent(sc.Prometheus)
opentelemetry.StartAgent(sc.OpenTelemetry) opentelemetry.StartAgent(sc.Telemetry)
if len(sc.MetricsUrl) > 0 { if len(sc.MetricsUrl) > 0 {
stat.SetReportWriter(stat.NewRemoteWriter(sc.MetricsUrl)) stat.SetReportWriter(stat.NewRemoteWriter(sc.MetricsUrl))