logger에 RecoverAndErrorSmallStack 추가

- Email -> Alias

logger/logger.go

@@ -2,43 +2,40 @@ package logger
 
 import (
 	"fmt"
-	"io"
 	"log"
 	"os"
-	"path"
 	"runtime"
 	"runtime/debug"
+	"strconv"
 	"strings"
 
 	"repositories.action2quare.com/ayo/gocommon/flagx"
 )
 
 var stdlogger *log.Logger
-var UseLogFile = flagx.Bool("logfile", false, "")
+var _ = flagx.Int("logprefix", 3, "0 : no_prefix, 1 : date, 2 : time, 3 : datetime")
 
 func init() {
 	binpath, _ := os.Executable()
-	binname := path.Base(strings.ReplaceAll(binpath, "\\", "/"))
+	outWriter := os.Stdout
 
-	var outWriter io.Writer
-	outWriter = os.Stdout
-
-	if *UseLogFile {
-		ext := path.Ext(binname)
-		if len(ext) > 0 {
-			binname = binname[:len(binname)-len(ext)]
+	args := os.Args
+	logprefix := 3
+	for _, arg := range args {
+		if strings.HasPrefix(arg, "-logprefix=") {
+			logprefix, _ = strconv.Atoi(arg[11:])
+			break
+		}
 	}
 
-		logFile, err := os.Create(fmt.Sprintf("%s.log", binname))
-		if err != nil {
-			os.Stdout.Write([]byte(err.Error()))
-			panic(err)
-		}
-
-		outWriter = io.MultiWriter(outWriter, logFile)
-	}
+	pid := fmt.Sprintf("[%d]", os.Getpid())
+	outWriter.Write([]byte(strings.Join(append([]string{pid, binpath}, args...), " ")))
 
+	if logprefix < 4 {
+		stdlogger = log.New(outWriter, "", logprefix)
+	} else {
 		stdlogger = log.New(outWriter, "", log.LstdFlags)
+	}
 }
 
 func Println(v ...interface{}) {
@@ -130,3 +127,33 @@ func ErrorWithCallStack(err error) error {
 		frames: frames,
 	}
 }
+
+func ErrorSmallStack() {
+	buf := make([]byte, 1024)
+	n := runtime.Stack(buf, false)
+	if n < len(buf) {
+		buf = buf[:n]
+	}
+
+	Error(string(buf))
+}
+
+func RecoverAndErrorSmallStack(r any) any {
+	if r != nil {
+		pc := make([]uintptr, 10)
+		runtime.Callers(1, pc)
+		curframes := runtime.CallersFrames(pc)
+		var out []string
+		for {
+			frame, more := curframes.Next()
+			out = append(out, fmt.Sprintf("%s\n\t%s:%d", frame.Function, frame.File, frame.Line))
+			if !more {
+				break
+			}
+		}
+
+		Error(strings.Join(out, "\n"))
+	}
+
+	return r
+}

metric/prometheus.go

@@ -135,7 +135,11 @@ func (pe *prometheusExporter) loop(ctx context.Context) {
 			}
 
 			if err := prometheus.Register(nextcollector); err != nil {
+				if _, ok := err.(prometheus.AlreadyRegisteredError); ok {
+					// 이미 등록된 metric. child process를 여럿 실행하면 발생됨
+				} else {
 					logger.Error("prometheus register err :", *nm, err)
+				}
 			} else {
 				collector = nextcollector
 			}

mongo.go

@@ -154,10 +154,36 @@ func (mc *MongoClient) DropIndex(coll CollectionName, name string) error {
 }
 
 func (mc *MongoClient) Watch(coll CollectionName, pipeline mongo.Pipeline, opts ...*options.ChangeStreamOptions) (*mongo.ChangeStream, error) {
+	// mc.db.RunCommand()
 	if len(opts) == 0 {
 		opts = []*options.ChangeStreamOptions{options.ChangeStream().SetFullDocument(options.UpdateLookup).SetMaxAwaitTime(0)}
 	}
+
+	stream, err := mc.Collection(coll).Watch(mc.ctx, pipeline, opts...)
+	if err != nil {
+		if mongoErr, ok := err.(mongo.CommandError); ok {
+			logger.Println("MongoClient Watch return err code :", mongoErr, mongoErr.Code)
+			if mongoErr.Code == 40573 {
+				adminDb := mc.db.Client().Database("admin")
+				result := adminDb.RunCommand(mc.ctx, bson.D{
+					{Key: "modifyChangeStreams", Value: 1},
+					{Key: "database", Value: mc.db.Name()},
+					{Key: "collection", Value: coll},
+					{Key: "enable", Value: true},
+				})
+
+				if result.Err() != nil {
+					logger.Println("mc.db.RunCommand failed :", result.Err(), mc.db.Name(), coll)
+				} else {
 					return mc.Collection(coll).Watch(mc.ctx, pipeline, opts...)
+				}
+			}
+		}
+
+		logger.Fatal(err)
+	}
+
+	return stream, err
 }
 
 func (mc *MongoClient) Collection(collname CollectionName) *mongo.Collection {

server.go

@@ -14,6 +14,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
+	"path"
 	"reflect"
 	"runtime"
 	"strconv"
@@ -40,6 +41,13 @@ func init() {
 	gob.Register([]any{})
 }
 
+type ServerMuxInterface interface {
+	http.Handler
+
+	HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request))
+	Handle(pattern string, handler http.Handler)
+}
+
 const (
 	// HTTPStatusReloginRequired : http status를 이걸 받으면 클라이언트는 로그아웃하고 로그인 화면으로 돌아가야 한다.
 	HTTPStatusReloginRequired = 599
@@ -139,8 +147,19 @@ func isTlsEnabled(fileout ...*string) bool {
 	return true
 }
 
+func registUnhandledPattern(serveMux ServerMuxInterface) {
+	defer func() {
+		recover()
+	}()
+
+	serveMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		logger.Println("page not found :", r.URL.Path)
+		w.WriteHeader(http.StatusNotFound)
+	})
+}
+
 // NewHTTPServer :
-func NewHTTPServerWithPort(serveMux *http.ServeMux, port int) *Server {
+func NewHTTPServerWithPort(serveMux ServerMuxInterface, port int) *Server {
 	if isTlsEnabled() && port == 80 {
 		port = 443
 	}
@@ -148,16 +167,21 @@ func NewHTTPServerWithPort(serveMux *http.ServeMux, port int) *Server {
 	serveMux.HandleFunc(MakeHttpHandlerPattern("welcome"), welcomeHandler)
 	serveMux.HandleFunc(MakeHttpHandlerPattern("lb_health_chceck"), healthCheckHandler)
 	serveMux.HandleFunc(MakeHttpHandlerPattern("lb_health_check"), healthCheckHandler)
+	registUnhandledPattern(serveMux)
 
 	server := &Server{
-		httpserver: &http.Server{Addr: addr, Handler: serveMux},
+		httpserver: &http.Server{
+			Addr:           addr,
+			Handler:        serveMux,
+			MaxHeaderBytes: 2 << 20, // 2 MB
+		},
 	}
 	server.httpserver.SetKeepAlivesEnabled(true)
 
 	return server
 }
 
-func NewHTTPServer(serveMux *http.ServeMux) *Server {
+func NewHTTPServer(serveMux ServerMuxInterface) *Server {
 
 	// 시작시 자동으로 enable됨
 	if isTlsEnabled() && *portptr == 80 {
@@ -206,7 +230,12 @@ func (server *Server) Stop() {
 }
 
 // Start :
-func (server *Server) Start() error {
+func (server *Server) Start(name ...string) error {
+	if len(name) == 0 {
+		exepath, _ := os.Executable()
+		name = []string{path.Base(exepath)}
+	}
+
 	if server.httpserver != nil {
 		ln, r := net.Listen("tcp", server.httpserver.Addr)
 		if r != nil {
@@ -235,6 +264,7 @@ func (server *Server) Start() error {
 			err = server.httpserver.ServeTLS(proxyListener, crtfile, keyfile)
 		} else {
 			logger.Println("tls disabled")
+			logger.Println(strings.Join(name, ", "), "started")
 			err = server.httpserver.Serve(proxyListener)
 		}
 
@@ -481,6 +511,13 @@ func ReadStringFormValue(r url.Values, key string) (string, bool) {
 	return strval, len(strval) > 0
 }
 
+func ReadStringsFormValue(r url.Values, key string) ([]string, bool) {
+	if r.Has(key) {
+		return (map[string][]string)(r)[key], true
+	}
+	return nil, false
+}
+
 type encoder interface {
 	Encode(any) error
 }

session/common.go

@@ -19,7 +19,7 @@ type Authorization struct {
 	// by authorization provider
 	Platform string `bson:"p" json:"p"`
 	Uid      string `bson:"u" json:"u"`
-	Email    string `bson:"em" json:"em"`
+	Alias    string `bson:"al" json:"al"`
 }
 
 func (auth *Authorization) ToStrings() []string {
@@ -27,7 +27,7 @@ func (auth *Authorization) ToStrings() []string {
 		"a", auth.Account.Hex(),
 		"p", auth.Platform,
 		"u", auth.Uid,
-		"em", auth.Email,
+		"al", auth.Alias,
 		"inv", auth.invalidated,
 	}
 }
@@ -42,7 +42,7 @@ func MakeAuthrizationFromStringMap(src map[string]string) Authorization {
 		Account:     accid,
 		Platform:    src["p"],
 		Uid:         src["u"],
-		Email:       src["em"],
+		Alias:       src["al"],
 		invalidated: src["inv"],
 	}
 }

wshandler/wshandler.go

@@ -188,6 +188,7 @@ type websocketHandlerBase struct {
 type WebsocketHandler struct {
 	WebsocketApiBroker
 	websocketHandlerBase
+	opt *WebsocketHandlerOption
 }
 
 type wsConfig struct {
@@ -205,7 +206,28 @@ func init() {
 	gob.Register([]any{})
 }
 
-func NewWebsocketHandler(consumer session.Consumer, redisUrl string) (*WebsocketHandler, error) {
+type WebsocketHandlerOption struct {
+	ReadBufferSize, WriteBufferSize int
+}
+
+func Option() *WebsocketHandlerOption {
+	return &WebsocketHandlerOption{
+		ReadBufferSize:  0,
+		WriteBufferSize: 0,
+	}
+}
+
+func (opt *WebsocketHandlerOption) SetReadBufferSize(size int) *WebsocketHandlerOption {
+	opt.ReadBufferSize = size
+	return opt
+}
+
+func (opt *WebsocketHandlerOption) SetWriteBufferSize(size int) *WebsocketHandlerOption {
+	opt.WriteBufferSize = size
+	return opt
+}
+
+func NewWebsocketHandler(consumer session.Consumer, redisUrl string, opts ...*WebsocketHandlerOption) (*WebsocketHandler, error) {
 	var config wsConfig
 	if err := gocommon.LoadConfig(&config); err != nil {
 		return nil, err
@@ -240,6 +262,14 @@ func NewWebsocketHandler(consumer session.Consumer, redisUrl string) (*Websocket
 		}
 	}()
 
+	var opt *WebsocketHandlerOption
+	if len(opts) > 0 {
+		// TODO : opts merge
+		opt = opts[0]
+	} else {
+		opt = Option()
+	}
+
 	ws := &WebsocketHandler{
 		websocketHandlerBase: websocketHandlerBase{
 			redisMsgChanName:  fmt.Sprintf("_wsh_msg_%d", redisSync.Options().DB),
@@ -252,6 +282,7 @@ func NewWebsocketHandler(consumer session.Consumer, redisUrl string) (*Websocket
 			sendMsgChan:       sendchan,
 			sessionConsumer:   consumer,
 		},
+		opt: opt,
 	}
 	consumer.RegisterOnSessionInvalidated(ws.onSessionInvalidated)
 	return ws, nil
@@ -266,7 +297,7 @@ func (ws *WebsocketHandler) Cleanup() {
 	ws.connWaitGroup.Wait()
 }
 
-func (ws *WebsocketHandler) RegisterHandlers(serveMux *http.ServeMux, prefix string) error {
+func (ws *WebsocketHandler) RegisterHandlers(serveMux gocommon.ServerMuxInterface, prefix string) error {
 	url := gocommon.MakeHttpHandlerPattern(prefix, "ws")
 	if *noAuthFlag {
 		serveMux.HandleFunc(url, ws.upgrade_nosession)
@@ -665,7 +696,10 @@ func (ws *WebsocketHandler) upgrade_nosession(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	var upgrader = websocket.Upgrader{} // use default options
+	var upgrader = websocket.Upgrader{
+		ReadBufferSize:  ws.opt.ReadBufferSize,
+		WriteBufferSize: ws.opt.WriteBufferSize,
+	} // use default options
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -695,6 +729,11 @@ func (ws *WebsocketHandler) upgrade(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	sk := r.Header.Get("AS-X-SESSION")
+	if len(sk) == 0 {
+		w.WriteHeader(http.StatusUnauthorized)
+		return
+	}
+
 	authinfo, err := ws.sessionConsumer.Query(sk)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -712,7 +751,10 @@ func (ws *WebsocketHandler) upgrade(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var upgrader = websocket.Upgrader{} // use default options
+	var upgrader = websocket.Upgrader{
+		ReadBufferSize:  ws.opt.ReadBufferSize,
+		WriteBufferSize: ws.opt.WriteBufferSize,
+	} // use default options
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)

wshandler/wshandler_peer.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/logger"
 	"repositories.action2quare.com/ayo/gocommon/session"
 
@@ -18,7 +19,7 @@ import (
 )
 
 type WebsocketPeerHandler interface {
-	RegisterHandlers(serveMux *http.ServeMux, prefix string) error
+	RegisterHandlers(serveMux gocommon.ServerMuxInterface, prefix string) error
 }
 
 type peerCtorChannelValue struct {
@@ -164,7 +165,7 @@ func NewWebsocketPeerHandler[T PeerInterface](consumer session.Consumer, creator
 	return wsh
 }
 
-func (ws *websocketPeerHandler[T]) RegisterHandlers(serveMux *http.ServeMux, prefix string) error {
+func (ws *websocketPeerHandler[T]) RegisterHandlers(serveMux gocommon.ServerMuxInterface, prefix string) error {
 	if *noAuthFlag {
 		serveMux.HandleFunc(prefix, ws.upgrade_noauth)
 	} else {