merge log into common log

This commit is contained in:
Darien Raymond committed 2017-12-19 21:28:12 +01:00
1 parent 054ceb865d
commit f4c35db968
45 files changed
+297 -406

No files matched your search

+2 -3
View File
@@ -11,7 +11,6 @@ import (
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/app/dns"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
)
@@ -144,13 +143,13 @@ func (s *CacheServer) Get(domain string) []net.IP {
LastAccess: time.Now(),
}
s.Unlock()
log.Trace(newError("returning ", len(a.IPs), " IPs for domain ", domain).AtDebug())
newError("returning ", len(a.IPs), " IPs for domain ", domain).AtDebug().WriteToLog()
return a.IPs
case <-time.After(QueryTimeout):
}
}
log.Trace(newError("returning nil for domain ", domain).AtDebug())
newError("returning nil for domain ", domain).AtDebug().WriteToLog()
return nil
}