history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve: add log level

Browse Source
This commit is contained in:
Dreamacro
2018-06-22 13:15:20 +08:00
parent 9c2ace1f91
commit 018a6ba041
3 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tunnel/log.go
View File

@ -7,21 +7,21 @@ import (
)
const (
INFO LogType = iota
ERROR LogLevel = iota
WARNING
ERROR
INFO
DEBUG
)
type LogType int
type LogLevel int
type Log struct {
LogType LogType
Payload string
LogLevel LogLevel
Payload string
}
func (l *Log) Type() string {
switch l.LogType {
switch l.LogLevel {
case INFO:
return "Info"
case WARNING:
@ -36,7 +36,7 @@ func (l *Log) Type() string {
}
func print(data Log) {
switch data.LogType {
switch data.LogLevel {
case INFO:
log.Infoln(data.Payload)
case WARNING:
@ -59,9 +59,9 @@ func (t *Tunnel) subscribeLogs() {
}
}
func newLog(logType LogType, format string, v ...interface{}) Log {
func newLog(logLevel LogLevel, format string, v ...interface{}) Log {
return Log{
LogType: logType,
Payload: fmt.Sprintf(format, v...),
LogLevel: logLevel,
Payload: fmt.Sprintf(format, v...),
}
}

2
tunnel/tunnel.go
View File

@ -184,7 +184,7 @@ func (t *Tunnel) match(addr *C.Addr) C.Proxy {
if !ok {
continue
}
t.logCh <- newLog(INFO, "%v match %d using %s", addr.String(), rule.RuleType(), rule.Adapter())
t.logCh <- newLog(INFO, "%v match %s using %s", addr.String(), rule.RuleType().String(), rule.Adapter())
return a
}
}