From 6991dd777d6aa5f6e676fa233490dfed4ae07349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 23 Feb 2021 12:47:23 +0000 Subject: [PATCH 1/2] ocis already does the cli flag parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- accounts/pkg/server/grpc/server.go | 1 - accounts/pkg/server/http/server.go | 1 - graph-explorer/pkg/server/http/server.go | 1 - graph/pkg/server/http/server.go | 1 - idp/pkg/server/http/server.go | 1 - ocs/pkg/server/http/server.go | 1 - onlyoffice/pkg/server/http/server.go | 1 - proxy/pkg/server/http/server.go | 1 - settings/pkg/server/grpc/server.go | 1 - settings/pkg/server/http/server.go | 1 - store/pkg/server/grpc/server.go | 1 - thumbnails/pkg/server/grpc/server.go | 1 - web/pkg/server/http/server.go | 1 - webdav/pkg/server/http/server.go | 1 - 14 files changed, 14 deletions(-) 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 f654450e98..5658c75be2 100644 --- a/accounts/pkg/server/http/server.go +++ b/accounts/pkg/server/http/server.go @@ -63,6 +63,5 @@ func Server(opts ...Option) http.Service { micro.RegisterHandler(service.Server(), mux) - service.Init() return service } diff --git a/graph-explorer/pkg/server/http/server.go b/graph-explorer/pkg/server/http/server.go index b290a79eb6..3d85254813 100644 --- a/graph-explorer/pkg/server/http/server.go +++ b/graph-explorer/pkg/server/http/server.go @@ -49,6 +49,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go index 916a6b8fc7..49f168405f 100644 --- a/graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -56,6 +56,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/idp/pkg/server/http/server.go b/idp/pkg/server/http/server.go index bafbed9997..ac310e113e 100644 --- a/idp/pkg/server/http/server.go +++ b/idp/pkg/server/http/server.go @@ -81,6 +81,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/ocs/pkg/server/http/server.go b/ocs/pkg/server/http/server.go index aae9ae99ca..527a9a4135 100644 --- a/ocs/pkg/server/http/server.go +++ b/ocs/pkg/server/http/server.go @@ -48,6 +48,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/onlyoffice/pkg/server/http/server.go b/onlyoffice/pkg/server/http/server.go index f69dbfef39..f63babef7c 100644 --- a/onlyoffice/pkg/server/http/server.go +++ b/onlyoffice/pkg/server/http/server.go @@ -58,6 +58,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/proxy/pkg/server/http/server.go b/proxy/pkg/server/http/server.go index d0629f5bfd..ea56bb1462 100644 --- a/proxy/pkg/server/http/server.go +++ b/proxy/pkg/server/http/server.go @@ -61,6 +61,5 @@ func Server(opts ...Option) (svc.Service, error) { micro.RegisterHandler(service.Server(), chain) - 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 b09a01be91..2e10e4debf 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/thumbnails/pkg/server/grpc/server.go @@ -46,6 +46,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 7e1256e921..dc81d42455 100644 --- a/web/pkg/server/http/server.go +++ b/web/pkg/server/http/server.go @@ -51,6 +51,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } diff --git a/webdav/pkg/server/http/server.go b/webdav/pkg/server/http/server.go index 76c0233032..c9042f5664 100644 --- a/webdav/pkg/server/http/server.go +++ b/webdav/pkg/server/http/server.go @@ -48,6 +48,5 @@ func Server(opts ...Option) (http.Service, error) { micro.RegisterHandler(service.Server(), handle) - service.Init() return service, nil } From 25ca76ebd4f68d592b1c438a0494fc18fe3eded7 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 2 Jul 2021 13:33:04 +0200 Subject: [PATCH 2/2] add changelog --- changelog/unreleased/removed-redundant-init.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/removed-redundant-init.md 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