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

ocis already does the cli flag parsing
This commit is contained in:
Jörn Friedrich Dreyer
2021-07-07 10:36:04 +02:00
committed by GitHub
15 changed files with 5 additions and 14 deletions

View File

@@ -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
}

View File

@@ -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
}

View 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

View File

@@ -51,6 +51,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -58,6 +58,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -82,6 +82,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -60,6 +60,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -56,6 +56,5 @@ func Server(opts ...Option) (svc.Service, error) {
return svc.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -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
}

View File

@@ -73,6 +73,5 @@ func Server(opts ...Option) http.Service {
micro.RegisterHandler(service.Server(), mux)
service.Init()
return service
}

View File

@@ -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
}

View File

@@ -54,6 +54,5 @@ func NewService(opts ...Option) grpc.Service {
thumbnail,
)
service.Init()
return service
}

View File

@@ -53,6 +53,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}

View File

@@ -50,6 +50,5 @@ func Server(opts ...Option) (http.Service, error) {
return http.Service{}, err
}
service.Init()
return service, nil
}