From 25114e403cf24235b09d32cc84f9e5e352617a1f Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Tue, 26 Mar 2024 18:38:02 +0800 Subject: [PATCH] fix: discov update. --- pkg/util/flag/doc.go | 15 ------------ pkg/util/flag/flag.go | 54 ------------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 pkg/util/flag/doc.go delete mode 100644 pkg/util/flag/flag.go diff --git a/pkg/util/flag/doc.go b/pkg/util/flag/doc.go deleted file mode 100644 index 96939328d..000000000 --- a/pkg/util/flag/doc.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright © 2024 OpenIM. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package flag // import "github.com/openimsdk/open-im-server/v3/pkg/util/flag" diff --git a/pkg/util/flag/flag.go b/pkg/util/flag/flag.go deleted file mode 100644 index 0a8e527ab..000000000 --- a/pkg/util/flag/flag.go +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright © 2024 OpenIM. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package flag - -import ( - "flag" - "log" - "strings" - - "github.com/spf13/pflag" -) - -// WordSepNormalizeFunc changes all flags that contain "_" separators. -func WordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName { - if strings.Contains(name, "_") { - return pflag.NormalizedName(strings.ReplaceAll(name, "_", "-")) - } - return pflag.NormalizedName(name) -} - -// WarnWordSepNormalizeFunc changes and warns for flags that contain "_" separators. -func WarnWordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName { - if strings.Contains(name, "_") { - normalizedName := strings.ReplaceAll(name, "_", "-") - log.Printf("WARNING: flag %s has been deprecated and will be removed in a future version. Use %s instead.", name, normalizedName) - return pflag.NormalizedName(normalizedName) - } - return pflag.NormalizedName(name) -} - -// InitFlags normalizes, parses, then logs the command line flags. -func InitFlags() { - pflag.CommandLine.SetNormalizeFunc(WordSepNormalizeFunc) - pflag.CommandLine.AddGoFlagSet(flag.CommandLine) -} - -// PrintFlags logs the flags in the flagset. -func PrintFlags(flags *pflag.FlagSet) { - flags.VisitAll(func(flag *pflag.Flag) { - log.Printf("FLAG: --%s=%q", flag.Name, flag.Value) - }) -}