config 중복 수정

azure/misc.go

@@ -4,7 +4,6 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
-	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -17,6 +16,7 @@ import (
 	"syscall"
 	"time"
 
+	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/logger"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -54,12 +54,6 @@ type HoustonStatReport struct {
 	PlayingSessions int     `json:"sessions"`
 }
 
-var prefetchptr = flag.Bool("prefetch", false, "")
-
-func NeedPrefetch() bool {
-	return *prefetchptr
-}
-
 var ErrUpdateUnnecessary = errors.New("binary is already latest")
 
 func SelfUpdateUsingScript(replycache *MessageReplyCache, graph *Graph, patchroot string, force bool) (err error) {
@@ -202,8 +196,6 @@ func SelfUpdateUsingScript(replycache *MessageReplyCache, graph *Graph, patchroo
 	return
 }
 
-var linkupdate = flag.String("updatelink", "", "")
-
 func ReplyUpdateComplete() {
 	defer func() {
 		r := recover()
@@ -212,10 +204,10 @@ func ReplyUpdateComplete() {
 		}
 	}()
 
-	if len(*linkupdate) > 0 {
-		cache := DeserializeMessageReplyCache(*linkupdate)
+	if len(*gocommon.Linkupdate) > 0 {
+		cache := DeserializeMessageReplyCache(*gocommon.Linkupdate)
 		if cache != nil {
-			os.Remove(*linkupdate)
+			os.Remove(*gocommon.Linkupdate)
 			if cache.ReplyWrap != nil {
 				cache.ReplyWrap.Update(cache.Replyaid, "업데이트 완료")
 			}

flag/flag_helper.go

@@ -1,56 +0,0 @@
-package flag
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-)
-
-var flaged = make(map[string]interface{})
-
-func IntNoCase(name string, value int, usage string) *int {
-	test := fmt.Sprintf("--%s=", name)
-	for _, arg := range os.Args {
-		if strings.HasPrefix(strings.ToLower(arg), test) || strings.HasPrefix(strings.ToLower(arg), test[1:]) {
-			kv := strings.Split(arg, "=")
-			realname := strings.TrimLeft(kv[0], "-")
-			oldptr, ok := flaged[realname]
-
-			if !ok {
-				ptr := flag.Int(realname, value, usage)
-				flaged[realname] = ptr
-				return ptr
-			}
-
-			return oldptr.(*int)
-		}
-	}
-
-	defval := new(int)
-	*defval = value
-	return defval
-}
-
-func StringNoCase(name string, value string, usage string) *string {
-	test := fmt.Sprintf("--%s=", name)
-	for _, arg := range os.Args {
-		if strings.HasPrefix(strings.ToLower(arg), test) || strings.HasPrefix(strings.ToLower(arg), test[1:]) {
-			kv := strings.Split(arg, "=")
-			realname := strings.TrimLeft(kv[0], "-")
-			oldptr, ok := flaged[realname]
-			if !ok {
-				ptr := flag.String(realname, value, usage)
-				flaged[realname] = ptr
-				return ptr
-			}
-
-			return oldptr.(*string)
-		}
-	}
-
-	defval := new(string)
-	*defval = value
-
-	return defval
-}

flags.go

@@ -4,3 +4,10 @@ import "flag"
 
 var commandLine = flag.NewFlagSet("gocommon", flag.ExitOnError)
 var devflag = commandLine.Bool("dev", false, "")
+var configfileflag = commandLine.String("config", "", "")
+var PrefixPtr = commandLine.String("prefix", "", "'")
+var portptr = commandLine.Int("port", 80, "")
+var tls = commandLine.String("tls", "", "")
+var NoSessionFlag = commandLine.Bool("nosession", false, "nosession=[true|false]")
+var NeedPrefetch = commandLine.Bool("prefetch", false, "")
+var Linkupdate = commandLine.String("updatelink", "", "")

reflect_config.go

@@ -2,13 +2,10 @@ package gocommon
 
 import (
 	"encoding/json"
-	"flag"
 	"os"
 	"time"
 )
 
-var configfileflag = flag.String("config", "", "")
-
 func configFilePath() string {
 	configfilepath := "config.json"
 	if configfileflag != nil && len(*configfileflag) > 0 {

server.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"flag"
 	"fmt"
 	"io"
 	"math"
@@ -63,10 +62,6 @@ type Server struct {
 	interrupt  chan os.Signal
 }
 
-var PrefixPtr = flag.String("prefix", "", "'")
-var portptr = flag.Int("port", 80, "")
-var tls = flag.String("tls", "", "")
-var NoSessionFlag = flag.Bool("nosession", false, "nosession=[true|false]")
 var healthcheckcounter = int64(0)
 
 func healthCheckHandler(w http.ResponseWriter, r *http.Request) {