diff --git a/common/log/log.go b/common/log/log.go index edc967f..3022cab 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -1,6 +1,6 @@ package log -import "log" +import stdlog "log" // Func defines a simple log function type Func func(f string, v ...interface{}) @@ -11,10 +11,10 @@ var F Func = func(f string, v ...interface{}) { // Fatal log and exit func Fatal(v ...interface{}) { - log.Fatal(v) + stdlog.Fatal(v) } // Fatalf log and exit func Fatalf(f string, v ...interface{}) { - log.Fatalf(f, v) + stdlog.Fatalf(f, v) } diff --git a/main.go b/main.go index e9334c9..6fe1c33 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + stdlog "log" "os" "os/signal" "strings" @@ -35,11 +36,11 @@ func main() { confInit() - // log.F = func(f string, v ...interface{}) { - // if conf.Verbose { - // stdlog.Printf(f, v...) - // } - // } + log.F = func(f string, v ...interface{}) { + if conf.Verbose { + stdlog.Printf(f, v...) + } + } sDialer := NewRuleDialer(conf.rules, dialerFromConf()) diff --git a/proxy/socks5/socks5.go b/proxy/socks5/socks5.go index a76734b..1768814 100644 --- a/proxy/socks5/socks5.go +++ b/proxy/socks5/socks5.go @@ -26,7 +26,7 @@ import ( "github.com/nadoo/glider/proxy" ) -// Version: socks5 version +// Version is socks5 version number const Version = 5 // SOCKS5 struct