buyfakett/server_torii
1
0
Fork 0
mirror of https://github.com/Rayzggz/server_torii.git synced 2025-06-19 05:31:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use reqData to load log info

Browse Source
This commit is contained in:
Roi Feng
2025-04-28 21:52:42 -04:00
parent c0524c56e7
commit af4af7346a
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/dataType/type.go
View File

@ -1,7 +1,5 @@
package dataType package dataType
import "server_torii/internal/utils"
type UserRequest struct { type UserRequest struct {
RemoteIP string RemoteIP string
Uri string Uri string
@ -36,5 +34,4 @@ type HTTPFloodRule struct {
type SharedMemory struct { type SharedMemory struct {
HTTPFloodSpeedLimitCounter *Counter HTTPFloodSpeedLimitCounter *Counter
HTTPFloodSameURILimitCounter *Counter HTTPFloodSameURILimitCounter *Counter
Logger *utils.LogxManager
} }

37
internal/utils/logx.go
View File

@ -5,6 +5,7 @@ import (
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
"server_torii/internal/dataType"
"sync" "sync"
"time" "time"
@ -71,43 +72,43 @@ func (m *LogxManager) openLogFile(path string) *os.File {
return f return f
} }
func (m *LogxManager) LogInfo(ip, host, uri, ua, msg, msg2 string) { func (m *LogxManager) LogInfo(reqData dataType.UserRequest, msg, msg2 string) {
lg := m.getLogger(host) lg := m.getLogger(reqData.Host)
line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s",
ip, reqData.RemoteIP,
time.Now().Format("02/Jan/2006:15:04:05 -0700"), time.Now().Format("02/Jan/2006:15:04:05 -0700"),
msg, msg,
host, reqData.Host,
uri, reqData.Uri,
ua, reqData.UserAgent,
msg2, msg2,
) )
lg.Info(line) lg.Info(line)
} }
func (m *LogxManager) LogError(ip, host, uri, ua, msg, msg2 string) { func (m *LogxManager) LogError(reqData dataType.UserRequest, msg, msg2 string) {
lg := m.getLogger(host) lg := m.getLogger(reqData.Host)
line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s",
ip, reqData.RemoteIP,
time.Now().Format("02/Jan/2006:15:04:05 -0700"), time.Now().Format("02/Jan/2006:15:04:05 -0700"),
msg, msg,
host, reqData.Host,
uri, reqData.Uri,
ua, reqData.UserAgent,
msg2, msg2,
) )
lg.Error(line) lg.Error(line)
} }
func (m *LogxManager) LogDebug(ip, host, uri, ua, msg, msg2 string) { func (m *LogxManager) LogDebug(reqData dataType.UserRequest, msg, msg2 string) {
lg := m.getLogger(host) lg := m.getLogger(reqData.Host)
line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s", line := fmt.Sprintf("%s - - [%s] %s %s %s %s %s",
ip, reqData.RemoteIP,
time.Now().Format("02/Jan/2006:15:04:05 -0700"), time.Now().Format("02/Jan/2006:15:04:05 -0700"),
msg, msg,
host, reqData.Host,
uri, reqData.Uri,
ua, reqData.UserAgent,
msg2, msg2,
) )
lg.Debug(line) lg.Debug(line)

1
main.go
View File

@ -56,7 +56,6 @@ func main() {
sharedMem := &dataType.SharedMemory{ sharedMem := &dataType.SharedMemory{
HTTPFloodSpeedLimitCounter: dataType.NewCounter(max(runtime.NumCPU()*8, 16), utils.FindMaxRateTime(ruleSet.HTTPFloodRule.HTTPFloodSpeedLimit)), 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)), HTTPFloodSameURILimitCounter: dataType.NewCounter(max(runtime.NumCPU()*8, 16), utils.FindMaxRateTime(ruleSet.HTTPFloodRule.HTTPFloodSameURILimit)),
Logger: utils.NewManager(cfg.LogPath),
} }
//GC //GC