diff --git a/management/cmd/management.go b/management/cmd/management.go index 2b13565a3..a4d67fc0b 100644 --- a/management/cmd/management.go +++ b/management/cmd/management.go @@ -19,28 +19,25 @@ import ( "github.com/google/uuid" "github.com/miekg/dns" + log "github.com/sirupsen/logrus" + "github.com/spf13/cobra" "golang.org/x/crypto/acme/autocert" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" - - "github.com/netbirdio/netbird/management/server/activity/sqlite" - httpapi "github.com/netbirdio/netbird/management/server/http" - "github.com/netbirdio/netbird/management/server/jwtclaims" - "github.com/netbirdio/netbird/management/server/metrics" - "github.com/netbirdio/netbird/management/server/telemetry" - - "github.com/netbirdio/netbird/management/server" - "github.com/netbirdio/netbird/management/server/idp" - "github.com/netbirdio/netbird/util" - - log "github.com/sirupsen/logrus" - "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" "github.com/netbirdio/netbird/encryption" mgmtProto "github.com/netbirdio/netbird/management/proto" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/activity/sqlite" + httpapi "github.com/netbirdio/netbird/management/server/http" + "github.com/netbirdio/netbird/management/server/idp" + "github.com/netbirdio/netbird/management/server/jwtclaims" + "github.com/netbirdio/netbird/management/server/metrics" + "github.com/netbirdio/netbird/management/server/telemetry" + "github.com/netbirdio/netbird/util" ) // ManagementLegacyPort is the port that was used before by the Management gRPC server. @@ -72,10 +69,15 @@ var ( Use: "management", Short: "start NetBird Management Server", PreRunE: func(cmd *cobra.Command, args []string) error { + flag.Parse() + err := util.InitLog(logLevel, logFile) + if err != nil { + return fmt.Errorf("failed initializing log %v", err) + } + // detect whether user specified a port userPort := cmd.Flag("port").Changed - var err error config, err = loadMgmtConfig(mgmtConfig) if err != nil { return fmt.Errorf("failed reading provided config file: %s: %v", mgmtConfig, err) @@ -104,13 +106,7 @@ var ( return nil }, RunE: func(cmd *cobra.Command, args []string) error { - flag.Parse() - err := util.InitLog(logLevel, logFile) - if err != nil { - return fmt.Errorf("failed initializing log %v", err) - } - - err = handleRebrand(cmd) + err := handleRebrand(cmd) if err != nil { return fmt.Errorf("failed to migrate files %v", err) }