fix golangci offenses

pkg/command/root.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis-settings/pkg/config"
 	"github.com/owncloud/ocis-settings/pkg/flagset"
 	"github.com/owncloud/ocis-settings/pkg/version"
-	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/spf13/viper"
 )
 

pkg/command/server.go

@@ -142,9 +142,7 @@ func Server(cfg *config.Config) *cli.Command {
 					http.Flags(flagset.ServerWithConfig(cfg)),
 				)
 
-				gr.Add(func() error {
-					return server.Run()
-				}, func(_ error) {
+				gr.Add(server.Run, func(_ error) {
 					logger.Info().
 						Str("server", "http").
 						Msg("Shutting down server")
@@ -163,9 +161,7 @@ func Server(cfg *config.Config) *cli.Command {
 					grpc.Flags(flagset.ServerWithConfig(cfg)),
 				)
 
-				gr.Add(func() error {
-					return server.Run()
-				}, func(_ error) {
+				gr.Add(server.Run, func(_ error) {
 					logger.Info().
 						Str("server", "http").
 						Msg("Shutting down server")
@@ -190,9 +186,7 @@ func Server(cfg *config.Config) *cli.Command {
 					return err
 				}
 
-				gr.Add(func() error {
-					return server.ListenAndServe()
-				}, func(_ error) {
+				gr.Add(server.ListenAndServe, func(_ error) {
 					ctx, timeout := context.WithTimeout(ctx, 5*time.Second)
 
 					defer timeout()