lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-14 17:49:15 -04:00
Code Issues Releases Wiki Activity

rework protocol buffer log settings

Browse Source
This commit is contained in:
Shelikhoo
2021-10-02 22:29:37 +01:00
parent 36df3b035c
commit ee185a5824
13 changed files with 221 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
infra/conf/synthetic/log/log.go
View File

@@ -9,9 +9,8 @@ import (
func DefaultLogConfig() *log.Config {
return &log.Config{
AccessLogType: log.LogType_None,
ErrorLogType: log.LogType_Console,
ErrorLogLevel: clog.Severity_Warning,
Access: &log.LogSpecification{Type: log.LogType_None},
Error: &log.LogSpecification{Type: log.LogType_Console, Level: clog.Severity_Warning},
}
}
@@ -26,36 +25,36 @@ func (v *LogConfig) Build() *log.Config {
return nil
}
config := &log.Config{
ErrorLogType: log.LogType_Console,
AccessLogType: log.LogType_Console,
Access: &log.LogSpecification{Type: log.LogType_Console},
Error: &log.LogSpecification{Type: log.LogType_Console},
}
if v.AccessLog == "none" {
config.AccessLogType = log.LogType_None
config.Access.Type = log.LogType_None
} else if len(v.AccessLog) > 0 {
config.AccessLogPath = v.AccessLog
config.AccessLogType = log.LogType_File
config.Access.Path = v.AccessLog
config.Access.Type = log.LogType_File
}
if v.ErrorLog == "none" {
config.ErrorLogType = log.LogType_None
config.Error.Type = log.LogType_None
} else if len(v.ErrorLog) > 0 {
config.ErrorLogPath = v.ErrorLog
config.ErrorLogType = log.LogType_File
config.Error.Path = v.ErrorLog
config.Error.Type = log.LogType_File
}
level := strings.ToLower(v.LogLevel)
switch level {
case "debug":
config.ErrorLogLevel = clog.Severity_Debug
config.Error.Level = clog.Severity_Debug
case "info":
config.ErrorLogLevel = clog.Severity_Info
config.Error.Level = clog.Severity_Info
case "error":
config.ErrorLogLevel = clog.Severity_Error
config.Error.Level = clog.Severity_Error
case "none":
config.ErrorLogType = log.LogType_None
config.AccessLogType = log.LogType_None
config.Error.Type = log.LogType_None
config.Error.Type = log.LogType_None
default:
config.ErrorLogLevel = clog.Severity_Warning
config.Error.Level = clog.Severity_Warning
}
return config
}

14
infra/conf/v4/v2ray_test.go
View File

@@ -149,11 +149,15 @@ func TestV2RayConfig(t *testing.T) {
Output: &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&log.Config{
ErrorLogType: log.LogType_File,
ErrorLogPath: "/var/log/v2ray/error.log",
ErrorLogLevel: clog.Severity_Error,
AccessLogType: log.LogType_File,
AccessLogPath: "/var/log/v2ray/access.log",
Error: &log.LogSpecification{
Type: log.LogType_File,
Level: clog.Severity_Error,
Path: "/var/log/v2ray/error.log",
},
Access: &log.LogSpecification{
Type: log.LogType_File,
Path: "/var/log/v2ray/access.log",
},
}),
serial.ToTypedMessage(&dispatcher.Config{}),
serial.ToTypedMessage(&proxyman.InboundConfig{}),