Merge pull request #1705 from owncloud/no-additional-init

ocis already does the cli flag parsing
owncloud · Jul 7, 2021 · cd4b391 · cd4b391
2 parents 54e1796 + 25ca76e
commit cd4b391
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) {
 		return http.Service{}, err
 	}
 
-	service.Init()
 	return service, nil
 }