lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-16 15:59:58 -04:00
Code Issues Releases Wiki Activity

move common/log to app/log

Browse Source
This commit is contained in:
Darien Raymond
2017-02-01 21:35:40 +01:00
parent 57fc444b3c
commit f046f334cd
59 changed files with 290 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dns/config.go
View File

@@ -3,7 +3,7 @@ package dns
import (
"net"
"v2ray.com/core/common/log"
"v2ray.com/core/app/log"
)
func (v *Config) GetInternalHosts() map[string]net.IP {

2
app/dns/dns.go
View File

@@ -9,6 +9,8 @@ import (
// A Server is a DNS server for responding DNS queries.
type Server interface {
Get(domain string) []net.IP
Start() error
Close()
}
func FromSpace(space app.Space) Server {

2
app/dns/server/nameserver.go
View File

@@ -10,7 +10,7 @@ import (
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/log"
"v2ray.com/core/app/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet/udp"
)

8
app/dns/server/server.go
View File

@@ -10,9 +10,9 @@ 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/errors"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
)
@@ -73,6 +73,12 @@ func (CacheServer) Interface() interface{} {
return (*dns.Server)(nil)
}
func (CacheServer) Start() error {
return nil
}
func (CacheServer) Close() {}
// Private: Visible for testing.
func (v *CacheServer) GetCached(domain string) []net.IP {
v.RLock()