diff --git a/internal/dataType/type.go b/internal/dataType/type.go index 5a13a16..5c77443 100644 --- a/internal/dataType/type.go +++ b/internal/dataType/type.go @@ -1,7 +1,5 @@ package dataType -import "server_torii/internal/utils" - type UserRequest struct { RemoteIP string Uri string @@ -36,5 +34,4 @@ type HTTPFloodRule struct { type SharedMemory struct { HTTPFloodSpeedLimitCounter *Counter HTTPFloodSameURILimitCounter *Counter - Logger *utils.LogxManager } diff --git a/internal/utils/logx.go b/internal/utils/logx.go index 43d9c19..ef5559d 100644 --- a/internal/utils/logx.go +++ b/internal/utils/logx.go @@ -5,6 +5,7 @@ import ( "log" "os" "path/filepath" + "server_torii/internal/dataType" "sync" "time" @@ -71,43 +72,43 @@ func (m *LogxManager) openLogFile(path string) *os.File { return f } -func (m *LogxManager) LogInfo(ip, host, uri, ua, msg, msg2 string) { - lg := m.getLogger(host) +func (m *LogxManager) LogInfo(reqData dataType.UserRequest, msg, msg2 string) { + lg := m.getLogger(reqData.Host) line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", - ip, + reqData.RemoteIP, time.Now().Format("02/Jan/2006:15:04:05 -0700"), msg, - host, - uri, - ua, + reqData.Host, + reqData.Uri, + reqData.UserAgent, msg2, ) lg.Info(line) } -func (m *LogxManager) LogError(ip, host, uri, ua, msg, msg2 string) { - lg := m.getLogger(host) +func (m *LogxManager) LogError(reqData dataType.UserRequest, msg, msg2 string) { + lg := m.getLogger(reqData.Host) line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", - ip, + reqData.RemoteIP, time.Now().Format("02/Jan/2006:15:04:05 -0700"), msg, - host, - uri, - ua, + reqData.Host, + reqData.Uri, + reqData.UserAgent, msg2, ) lg.Error(line) } -func (m *LogxManager) LogDebug(ip, host, uri, ua, msg, msg2 string) { - lg := m.getLogger(host) +func (m *LogxManager) LogDebug(reqData dataType.UserRequest, msg, msg2 string) { + lg := m.getLogger(reqData.Host) line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", - ip, + reqData.RemoteIP, time.Now().Format("02/Jan/2006:15:04:05 -0700"), msg, - host, - uri, - ua, + reqData.Host, + reqData.Uri, + reqData.UserAgent, msg2, ) lg.Debug(line) diff --git a/main.go b/main.go index 464c20d..320531e 100644 --- a/main.go +++ b/main.go @@ -56,7 +56,6 @@ func main() { sharedMem := &dataType.SharedMemory{ HTTPFloodSpeedLimitCounter: dataType.NewCounter(max(runtime.NumCPU()*8, 16), utils.FindMaxRateTime(ruleSet.HTTPFloodRule.HTTPFloodSpeedLimit)), HTTPFloodSameURILimitCounter: dataType.NewCounter(max(runtime.NumCPU()*8, 16), utils.FindMaxRateTime(ruleSet.HTTPFloodRule.HTTPFloodSameURILimit)), - Logger: utils.NewManager(cfg.LogPath), } //GC