Remove IDE-specific noise from source code.

This commit is contained in:
Eugene Bujak
2018-11-27 15:31:38 +03:00
parent 89753c4efb
commit 47e2a1004d
14 changed files with 4 additions and 52 deletions

View File

@@ -18,7 +18,6 @@ type DnsUpstream struct {
// NewDnsUpstream creates a new DNS upstream
func NewDnsUpstream(endpoint string, proto string, tlsServerName string) (Upstream, error) {
u := &DnsUpstream{
endpoint: endpoint,
timeout: defaultTimeout,
@@ -42,7 +41,6 @@ func NewDnsUpstream(endpoint string, proto string, tlsServerName string) (Upstre
// Exchange provides an implementation for the Upstream interface
func (u *DnsUpstream) Exchange(ctx context.Context, query *dns.Msg) (*dns.Msg, error) {
resp, err := u.exchange(u.proto, query)
// Retry over TCP if response is truncated
@@ -68,7 +66,6 @@ func (u *DnsUpstream) Exchange(ctx context.Context, query *dns.Msg) (*dns.Msg, e
// Clear resources
func (u *DnsUpstream) Close() error {
// Close active connections
u.transport.Stop()
return nil
@@ -77,7 +74,6 @@ func (u *DnsUpstream) Close() error {
// Performs a synchronous query. It sends the message m via the conn
// c and waits for a reply. The conn c is not closed.
func (u *DnsUpstream) exchange(proto string, query *dns.Msg) (r *dns.Msg, err error) {
// Establish a connection if needed (or reuse cached)
conn, err := u.transport.Dial(proto)
if err != nil {

View File

@@ -10,7 +10,6 @@ import (
// Detects the upstream type from the specified url and creates a proper Upstream object
func NewUpstream(url string, bootstrap string) (Upstream, error) {
proto := "udp"
prefix := ""
@@ -64,7 +63,6 @@ func NewUpstream(url string, bootstrap string) (Upstream, error) {
}
func CreateResolver(bootstrap string) *net.Resolver {
bootstrapResolver := net.DefaultResolver
if bootstrap != "" {
@@ -82,7 +80,6 @@ func CreateResolver(bootstrap string) *net.Resolver {
// Performs a simple health-check of the specified upstream
func IsAlive(u Upstream) (bool, error) {
// Using ipv4only.arpa. domain as it is a part of DNS64 RFC and it should exist everywhere
ping := new(dns.Msg)
ping.SetQuestion("ipv4only.arpa.", dns.TypeA)

View File

@@ -17,7 +17,6 @@ func init() {
// Read the configuration and initialize upstreams
func setup(c *caddy.Controller) error {
p, err := setupPlugin(c)
if err != nil {
return err
@@ -34,7 +33,6 @@ func setup(c *caddy.Controller) error {
// Read the configuration
func setupPlugin(c *caddy.Controller) (*UpstreamPlugin, error) {
p := New()
log.Println("Initializing the Upstream plugin")
@@ -72,7 +70,6 @@ func setupPlugin(c *caddy.Controller) (*UpstreamPlugin, error) {
func (p *UpstreamPlugin) onShutdown() error {
for i := range p.Upstreams {
u := p.Upstreams[i]
err := u.Close()
if err != nil {

View File

@@ -7,7 +7,6 @@ import (
)
func TestSetup(t *testing.T) {
var tests = []struct {
config string
}{

View File

@@ -9,7 +9,6 @@ import (
)
func TestDnsUpstreamIsAlive(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -32,7 +31,6 @@ func TestDnsUpstreamIsAlive(t *testing.T) {
}
func TestHttpsUpstreamIsAlive(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -54,7 +52,6 @@ func TestHttpsUpstreamIsAlive(t *testing.T) {
}
func TestDnsOverTlsIsAlive(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -77,7 +74,6 @@ func TestDnsOverTlsIsAlive(t *testing.T) {
}
func TestDnsUpstream(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -100,7 +96,6 @@ func TestDnsUpstream(t *testing.T) {
}
func TestHttpsUpstream(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -122,7 +117,6 @@ func TestHttpsUpstream(t *testing.T) {
}
func TestDnsOverTlsUpstream(t *testing.T) {
var tests = []struct {
url string
bootstrap string
@@ -154,7 +148,6 @@ func testUpstreamIsAlive(t *testing.T, u Upstream) {
}
func testUpstream(t *testing.T, u Upstream) {
var tests = []struct {
name string
expected net.IP