Merge pull request #6905 from owncloud/excds/feature/Separate_out_grpc_client_to_package_local_for_userlog_service

Separate out grpc client to package local for userlog service.
This commit is contained in:
Daniel Swärd
2023-07-27 12:24:22 +02:00
committed by GitHub
+4 -4
View File
@@ -61,7 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
return err return err
} }
err = ogrpc.Configure( grpcClient, err := ogrpc.NewClient(
append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(tracerProvider))..., append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(tracerProvider))...,
) )
if err != nil { if err != nil {
@@ -110,9 +110,9 @@ func Server(cfg *config.Config) *cli.Command {
return fmt.Errorf("could not get reva client selector: %s", err) return fmt.Errorf("could not get reva client selector: %s", err)
} }
hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", ogrpc.DefaultClient()) hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
vClient := settingssvc.NewValueService("com.owncloud.api.settings", ogrpc.DefaultClient()) vClient := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
rClient := settingssvc.NewRoleService("com.owncloud.api.settings", ogrpc.DefaultClient()) rClient := settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient)
{ {
server, err := http.Server( server, err := http.Server(