diff --git a/accounts/pkg/server/grpc/server.go b/accounts/pkg/server/grpc/server.go index c4c267770f..216b13e2e9 100644 --- a/accounts/pkg/server/grpc/server.go +++ b/accounts/pkg/server/grpc/server.go @@ -30,6 +30,5 @@ func Server(opts ...Option) grpc.Service { options.Logger.Fatal().Err(err).Msg("could not register index handler") } - service.Init() return service } diff --git a/accounts/pkg/server/http/server.go b/accounts/pkg/server/http/server.go index ffe86bf904..a71ca6f8f0 100644 --- a/accounts/pkg/server/http/server.go +++ b/accounts/pkg/server/http/server.go @@ -66,6 +66,5 @@ func Server(opts ...Option) http.Service { options.Logger.Fatal().Err(err).Msg("failed to register the handler") } - service.Init() return service } diff --git a/changelog/unreleased/removed-redundant-init.md b/changelog/unreleased/removed-redundant-init.md new file mode 100644 index 0000000000..bc18e89660 --- /dev/null +++ b/changelog/unreleased/removed-redundant-init.md @@ -0,0 +1,5 @@ +Enhancement: Remove unnecessary Service.Init() + +As it turns out oCIS already calls this method. Invoking it twice would end in accidentally resetting values. + +https://github.com/owncloud/ocis/pull/1705 diff --git a/graph-explorer/pkg/server/http/server.go b/graph-explorer/pkg/server/http/server.go index 992d816a69..5650948af0 100644 --- a/graph-explorer/pkg/server/http/server.go +++ b/graph-explorer/pkg/server/http/server.go @@ -51,6 +51,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go index 358dc5138f..60f2498b94 100644 --- a/graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -58,6 +58,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/idp/pkg/server/http/server.go b/idp/pkg/server/http/server.go index 9a911f4e84..72fab91c8d 100644 --- a/idp/pkg/server/http/server.go +++ b/idp/pkg/server/http/server.go @@ -82,6 +82,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/ocs/pkg/server/http/server.go b/ocs/pkg/server/http/server.go index 75fffac207..d19dfcc72a 100644 --- a/ocs/pkg/server/http/server.go +++ b/ocs/pkg/server/http/server.go @@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/onlyoffice/pkg/server/http/server.go b/onlyoffice/pkg/server/http/server.go index 244b1e9177..9d3a1de249 100644 --- a/onlyoffice/pkg/server/http/server.go +++ b/onlyoffice/pkg/server/http/server.go @@ -60,6 +60,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/proxy/pkg/server/http/server.go b/proxy/pkg/server/http/server.go index 0ac865f16f..9725a63e42 100644 --- a/proxy/pkg/server/http/server.go +++ b/proxy/pkg/server/http/server.go @@ -56,6 +56,5 @@ func Server(opts ...Option) (svc.Service, error) { return svc.Service{}, err } - service.Init() return service, nil } diff --git a/settings/pkg/server/grpc/server.go b/settings/pkg/server/grpc/server.go index 6fbfedb832..a2b5d1f1d6 100644 --- a/settings/pkg/server/grpc/server.go +++ b/settings/pkg/server/grpc/server.go @@ -34,6 +34,5 @@ func Server(opts ...Option) grpc.Service { options.Logger.Fatal().Err(err).Msg("could not register Permission service handler") } - service.Init() return service } diff --git a/settings/pkg/server/http/server.go b/settings/pkg/server/http/server.go index 77921cf8e7..cbdd8ccea2 100644 --- a/settings/pkg/server/http/server.go +++ b/settings/pkg/server/http/server.go @@ -73,6 +73,5 @@ func Server(opts ...Option) http.Service { micro.RegisterHandler(service.Server(), mux) - service.Init() return service } diff --git a/store/pkg/server/grpc/server.go b/store/pkg/server/grpc/server.go index 543b9566c9..148de47ad8 100644 --- a/store/pkg/server/grpc/server.go +++ b/store/pkg/server/grpc/server.go @@ -31,6 +31,5 @@ func Server(opts ...Option) grpc.Service { options.Logger.Fatal().Err(err).Msg("could not register service handler") } - service.Init() return service } diff --git a/thumbnails/pkg/server/grpc/server.go b/thumbnails/pkg/server/grpc/server.go index c436445c7d..8bfce82772 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/thumbnails/pkg/server/grpc/server.go @@ -54,6 +54,5 @@ func NewService(opts ...Option) grpc.Service { thumbnail, ) - service.Init() return service } diff --git a/web/pkg/server/http/server.go b/web/pkg/server/http/server.go index 051d04f6e1..d569d6faad 100644 --- a/web/pkg/server/http/server.go +++ b/web/pkg/server/http/server.go @@ -53,6 +53,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil } diff --git a/webdav/pkg/server/http/server.go b/webdav/pkg/server/http/server.go index 9c3046fe76..f4b016b2a0 100644 --- a/webdav/pkg/server/http/server.go +++ b/webdav/pkg/server/http/server.go @@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, err } - service.Init() return service, nil }