mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-01-07 04:40:05 -06:00
Merge pull request #1705 from owncloud/no-additional-init
ocis already does the cli flag parsing
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
5
changelog/unreleased/removed-redundant-init.md
Normal file
5
changelog/unreleased/removed-redundant-init.md
Normal file
@@ -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
|
||||
@@ -51,6 +51,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -58,6 +58,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -82,6 +82,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -60,6 +60,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -56,6 +56,5 @@ func Server(opts ...Option) (svc.Service, error) {
|
||||
return svc.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -73,6 +73,5 @@ func Server(opts ...Option) http.Service {
|
||||
|
||||
micro.RegisterHandler(service.Server(), mux)
|
||||
|
||||
service.Init()
|
||||
return service
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -54,6 +54,5 @@ func NewService(opts ...Option) grpc.Service {
|
||||
thumbnail,
|
||||
)
|
||||
|
||||
service.Init()
|
||||
return service
|
||||
}
|
||||
|
||||
@@ -53,6 +53,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
@@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
return http.Service{}, err
|
||||
}
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user