Skip to content

Commit

Permalink
fix: use error logs for usage
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaofei-du committed Feb 10, 2023
1 parent 7993469 commit 88ab8d4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
11 changes: 8 additions & 3 deletions cmd/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,14 @@ func main() {
// Usage collection
var usg usage.Usage
if !config.Config.Server.DisableUsage {
usageServiceClient, usageServiceClientConn := external.InitUsageServiceClient()
defer usageServiceClientConn.Close()
usg = usage.NewUsage(ctx, repository, usageServiceClient)
usageServiceClient, usageServiceClientConn, ok := external.InitUsageServiceClient()
if ok {
defer usageServiceClientConn.Close()
usg = usage.NewUsage(ctx, repository, usageServiceClient)
if usg != nil {
usg.StartReporter(ctx)
}
}
}

mgmtPB.RegisterMgmtPublicServiceServer(
Expand Down
10 changes: 5 additions & 5 deletions internal/external/external.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import (
)

// InitUsageServiceClient initializes a UsageServiceClient instance
func InitUsageServiceClient() (usagePB.UsageServiceClient, *grpc.ClientConn) {
func InitUsageServiceClient() (usagePB.UsageServiceClient, *grpc.ClientConn, bool) {
logger, _ := logger.GetZapLogger()

var clientDialOpts grpc.DialOption
if config.Config.UsageServer.TLSEnabled {
roots, err := x509.SystemCertPool()
if err != nil {
logger.Fatal(err.Error())
logger.Error(err.Error())
}

tlsConfig := tls.Config{
Expand Down Expand Up @@ -53,9 +53,9 @@ func InitUsageServiceClient() (usagePB.UsageServiceClient, *grpc.ClientConn) {
)

if err != nil {
logger.Fatal(err.Error())
logger.Error(err.Error())
return nil, nil, false
}

return usagePB.NewUsageServiceClient(clientConn), clientConn

return usagePB.NewUsageServiceClient(clientConn), clientConn, true
}
2 changes: 1 addition & 1 deletion pkg/usage/usage.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ func (u *usage) TriggerSingleReporter(ctx context.Context) {
logger, _ := logger.GetZapLogger()
err := usageClient.SingleReporter(ctx, u.reporter, usagePB.Session_SERVICE_MGMT, config.Config.Server.Edition, u.version, u.RetrieveUsageData())
if err != nil {
logger.Fatal(err.Error())
logger.Error(fmt.Sprintf("unable to trigger single reporter: %v\n", err))
}
}

0 comments on commit 88ab8d4

Please sign in to comment.