diff --git a/server/base/log.go b/server/base/log.go index 309716c..ed6f38b 100644 --- a/server/base/log.go +++ b/server/base/log.go @@ -28,6 +28,10 @@ var ( logName = "anylink.log" ) +func init() { + log.SetFlags(log.LstdFlags | log.Lshortfile) +} + // 实现 os.Writer 接口 type logWriter struct { UseStdout bool diff --git a/server/base/mod.go b/server/base/mod.go index 8b5016f..9a85791 100644 --- a/server/base/mod.go +++ b/server/base/mod.go @@ -50,20 +50,25 @@ func CheckModOrLoad(mod string) { return } + var err error + if mod == "tun" || mod == "tap" { - _, err := os.Stat(tunPath) + _, err = os.Stat(tunPath) if err == nil { // 文件存在 return } - panic("Linux tunFile is null " + tunPath) + err = fmt.Errorf("Linux tunFile is null %s", tunPath) + log.Println(err) + return + // panic(err) } if InContainer { - err := fmt.Errorf("Linux module %s is not loaded, please run `modprobe %s`", mod, mod) - // log.Println(err) - // return - panic(err) + err = fmt.Errorf("Linux module %s is not loaded, please run `modprobe %s`", mod, mod) + log.Println(err) + return + // panic(err) } cmdstr := fmt.Sprintln("modprobe", mod)