From bf971911d50b26492fc27b4f904026ee73c0c918 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Mon, 31 Jul 2023 20:11:47 +0330 Subject: [PATCH] log level & syslog Co-Authored-By: Alireza Ahmadi --- logger/logger.go | 112 +++++++++++++++++++++--------------- web/assets/js/model/xray.js | 5 +- web/controller/server.go | 9 +-- web/html/xui/index.html | 27 +++++---- web/service/server.go | 35 ++++++----- 5 files changed, 103 insertions(+), 85 deletions(-) diff --git a/logger/logger.go b/logger/logger.go index 6e49c850..6e824c78 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -1,98 +1,118 @@ package logger import ( + "fmt" "os" - "sync" + "time" "github.com/op/go-logging" ) -var ( - logger *logging.Logger - mu sync.Mutex -) +var logger *logging.Logger +var logBuffer []struct { + time string + level logging.Level + log string +} func init() { InitLogger(logging.INFO) } func InitLogger(level logging.Level) { - mu.Lock() - defer mu.Unlock() + newLogger := logging.MustGetLogger("x-ui") + var err error + var backend logging.Backend + var format logging.Formatter + ppid := os.Getppid() - if logger != nil { - return + if ppid == 1 { + backend, err = logging.NewSyslogBackend("") + format = logging.MustStringFormatter( + `%{level} - %{message}`, + ) + } + if err != nil || ppid != 1 { + backend = logging.NewLogBackend(os.Stderr, "", 0) + format = logging.MustStringFormatter( + `%{time:2006/01/02 15:04:05} %{level} - %{message}`, + ) } - format := logging.MustStringFormatter( - `%{time:2006/01/02 15:04:05} %{level} - %{message}`, - ) - newLogger := logging.MustGetLogger("x-ui") - backend := logging.NewLogBackend(os.Stderr, "", 0) backendFormatter := logging.NewBackendFormatter(backend, format) backendLeveled := logging.AddModuleLevel(backendFormatter) - backendLeveled.SetLevel(level, "") - newLogger.SetBackend(logging.MultiLogger(backendLeveled)) + backendLeveled.SetLevel(level, "x-ui") + newLogger.SetBackend(backendLeveled) logger = newLogger } func Debug(args ...interface{}) { - if logger != nil { - logger.Debug(args...) - } + logger.Debug(args...) + addToBuffer("DEBUG", fmt.Sprint(args...)) } func Debugf(format string, args ...interface{}) { - if logger != nil { - logger.Debugf(format, args...) - } + logger.Debugf(format, args...) + addToBuffer("DEBUG", fmt.Sprintf(format, args...)) } func Info(args ...interface{}) { - if logger != nil { - logger.Info(args...) - } + logger.Info(args...) + addToBuffer("INFO", fmt.Sprint(args...)) } func Infof(format string, args ...interface{}) { - if logger != nil { - logger.Infof(format, args...) - } + logger.Infof(format, args...) + addToBuffer("INFO", fmt.Sprintf(format, args...)) } func Warning(args ...interface{}) { - if logger != nil { - logger.Warning(args...) - } + logger.Warning(args...) + addToBuffer("WARNING", fmt.Sprint(args...)) } func Warningf(format string, args ...interface{}) { - if logger != nil { - logger.Warningf(format, args...) - } + logger.Warningf(format, args...) + addToBuffer("WARNING", fmt.Sprintf(format, args...)) } func Error(args ...interface{}) { - if logger != nil { - logger.Error(args...) - } + logger.Error(args...) + addToBuffer("ERROR", fmt.Sprint(args...)) } func Errorf(format string, args ...interface{}) { - if logger != nil { - logger.Errorf(format, args...) - } + logger.Errorf(format, args...) + addToBuffer("ERROR", fmt.Sprintf(format, args...)) } -func Notice(args ...interface{}) { - if logger != nil { - logger.Notice(args...) +func addToBuffer(level string, newLog string) { + t := time.Now() + if len(logBuffer) >= 10240 { + logBuffer = logBuffer[1:] } + + logLevel, _ := logging.LogLevel(level) + logBuffer = append(logBuffer, struct { + time string + level logging.Level + log string + }{ + time: t.Format("2006/01/02 15:04:05"), + level: logLevel, + log: newLog, + }) } -func Noticef(format string, args ...interface{}) { - if logger != nil { - logger.Noticef(format, args...) +func GetLogs(c int, level string) []string { + var output []string + logLevel, _ := logging.LogLevel(level) + + for i := len(logBuffer) - 1; i >= 0 && len(output) <= c; i-- { + if logBuffer[i].level <= logLevel { + output = append(output, fmt.Sprintf("%s %s - %s", logBuffer[i].time, logBuffer[i].level, logBuffer[i].log)) + } } + return output } diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 94dc4eaa..bf766cf0 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -402,7 +402,7 @@ class HttpStreamSettings extends XrayCommonClass { } static fromJson(json={}) { - return new HttpStreamSettings(json.path, json.host, json.sockopt); + return new HttpStreamSettings(json.path, json.host); } toJson() { @@ -461,8 +461,7 @@ class GrpcStreamSettings extends XrayCommonClass { static fromJson(json={}) { return new GrpcStreamSettings( json.serviceName, - json.multiMode, - json.sockopt + json.multiMode ); } diff --git a/web/controller/server.go b/web/controller/server.go index 086d9ec9..10baacb9 100644 --- a/web/controller/server.go +++ b/web/controller/server.go @@ -118,12 +118,9 @@ func (a *ServerController) restartXrayService(c *gin.Context) { func (a *ServerController) getLogs(c *gin.Context) { count := c.Param("count") - logLevel := c.PostForm("logLevel") - logs, err := a.serverService.GetLogs(count, logLevel) - if err != nil { - jsonMsg(c, "getLogs", err) - return - } + level := c.PostForm("level") + syslog := c.PostForm("syslog") + logs := a.serverService.GetLogs(count, level, syslog) jsonObj(c, logs, nil) } diff --git a/web/html/xui/index.html b/web/html/xui/index.html index 236ab010..0942b0ad 100644 --- a/web/html/xui/index.html +++ b/web/html/xui/index.html @@ -86,7 +86,7 @@ {{ i18n "menu.link" }}: - {{ i18n "pages.index.logs" }} + {{ i18n "pages.index.logs" }} {{ i18n "pages.index.config" }} {{ i18n "pages.index.backup" }} @@ -253,7 +253,7 @@ 10 20 @@ -262,9 +262,9 @@ - Debug Info @@ -273,8 +273,11 @@ Error + + + - +