Merge branch 'master' into fix-672

2020-11-10 15:49:24 +01:00
parent ecd2b8474d ad3ecbde46
commit d6e25798f7
18 changed files with 375 additions and 126 deletions
@@ -83,8 +83,8 @@ func Server(cfg *config.Config) *cli.Command {

 				gr.Add(func() error {
 					logger.Info().Str("service", server.Name()).Msg("Reporting settings bundles to settings service")
-					go svc.RegisterSettingsBundles(&logger)
-					go svc.RegisterPermissions(&logger)
+					svc.RegisterSettingsBundles(&logger)
+					svc.RegisterPermissions(&logger)
 					return server.Run()
 				}, func(_ error) {
 					logger.Info().