mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-27 18:58:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6543 from owncloud/excds/bugfix/Fix_nullpointer_in_notifications_service

Browse Source 
Fix nullpointer problems
This commit is contained in:
Daniel Swärd
2023-06-16 14:56:47 +02:00
committed by GitHub
parent 997cf54853 a3ee6f3648
commit d91241d39d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/notifications/pkg/command/server.go
View File

@@ -40,6 +40,11 @@ func Server(cfg *config.Config) *cli.Command {
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
err := grpc.Configure(grpc.GetClientOptions(&cfg.GRPCClientTLS)...)
if err != nil {
return err
}
gr := run.Group{}
ctx, cancel := func() (context.Context, context.CancelFunc) {

3
services/notifications/pkg/config/config.go
View File

@@ -18,7 +18,8 @@ type Config struct {
WebUIURL string `yaml:"ocis_url" env:"OCIS_URL;NOTIFICATIONS_WEB_UI_URL" desc:"The public facing URL of the oCIS Web UI, used e.g. when sending notification eMails"`
Notifications Notifications `yaml:"notifications"`
Notifications Notifications `yaml:"notifications"`
GRPCClientTLS shared.GRPCClientTLS `yaml:"grpc_client_tls"`
Context context.Context `yaml:"-"`
}