From 88b3796d74572f59f5afc7984b1c23239f54ab17 Mon Sep 17 00:00:00 2001 From: SunBK201 Date: Sat, 30 Dec 2023 01:43:53 +0800 Subject: [PATCH] feat(log): more log level option --- cmd/ua3f.go | 12 ++++++++++-- luci/cbi.lua | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/ua3f.go b/cmd/ua3f.go index 2321a01..0644d9f 100644 --- a/cmd/ua3f.go +++ b/cmd/ua3f.go @@ -85,7 +85,7 @@ func main() { func process(client net.Conn) { if err := Socks5Auth(client); err != nil { - logrus.Error("Auth failed: ", err) + // logrus.Error("Auth failed: ", err) client.Close() return } @@ -103,18 +103,26 @@ func Socks5Auth(client net.Conn) (err error) { buf := make([]byte, 256) n, err := io.ReadFull(client, buf[:2]) if n != 2 { + if err == io.EOF { + logrus.Warn(fmt.Sprintf("[%s][Auth] read EOF", client.RemoteAddr().String())) + } else { + logrus.Error(fmt.Sprintf("[%s][Auth] read header: %s", client.RemoteAddr().String(), err.Error())) + } return errors.New("reading header:" + err.Error()) } ver, nMethods := int(buf[0]), int(buf[1]) if ver != 5 { + logrus.Error(fmt.Sprintf("[%s][Auth] invalid ver", client.RemoteAddr().String())) return errors.New("invalid version") } n, err = io.ReadFull(client, buf[:nMethods]) if n != nMethods { - return errors.New("reading methods:" + err.Error()) + logrus.Error(fmt.Sprintf("[%s][Auth] read methods: %s", client.RemoteAddr().String(), err.Error())) + return errors.New("read methods:" + err.Error()) } n, err = client.Write([]byte{0x05, 0x00}) if n != 2 || err != nil { + logrus.Error(fmt.Sprintf("[%s][Auth] write rsp: %s", client.RemoteAddr().String(), err.Error())) return errors.New("write rsp:" + err.Error()) } return nil diff --git a/luci/cbi.lua b/luci/cbi.lua index 2e64161..9252581 100644 --- a/luci/cbi.lua +++ b/luci/cbi.lua @@ -39,6 +39,8 @@ log_level:value("debug") log_level:value("info") log_level:value("warn") log_level:value("error") +log_level:value("fatal") +log_level:value("panic") log = main:taboption("log", TextValue, "") log.readonly = true