mirror of
https://github.com/coredns/coredns.git
synced 2025-10-27 08:14:18 -04:00
cleanup: go vet and golint run (#736)
* cleanup: go vet and golint run Various cleanups trickered by go vet and golint. * Fix tests and lowercase all errors Lowercase all errors, some tests in kubernetes use errors from kubernetes which do start with a capital letter.
This commit is contained in:
@@ -16,8 +16,8 @@ import (
|
||||
"github.com/coredns/coredns/pb"
|
||||
)
|
||||
|
||||
// servergRPC represents an instance of a DNS-over-gRPC server.
|
||||
type servergRPC struct {
|
||||
// ServergRPC represents an instance of a DNS-over-gRPC server.
|
||||
type ServergRPC struct {
|
||||
*Server
|
||||
grpcServer *grpc.Server
|
||||
|
||||
@@ -25,18 +25,18 @@ type servergRPC struct {
|
||||
}
|
||||
|
||||
// NewServergRPC returns a new CoreDNS GRPC server and compiles all middleware in to it.
|
||||
func NewServergRPC(addr string, group []*Config) (*servergRPC, error) {
|
||||
func NewServergRPC(addr string, group []*Config) (*ServergRPC, error) {
|
||||
|
||||
s, err := NewServer(addr, group)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
gs := &servergRPC{Server: s}
|
||||
gs := &ServergRPC{Server: s}
|
||||
return gs, nil
|
||||
}
|
||||
|
||||
// Serve implements caddy.TCPServer interface.
|
||||
func (s *servergRPC) Serve(l net.Listener) error {
|
||||
func (s *ServergRPC) Serve(l net.Listener) error {
|
||||
s.m.Lock()
|
||||
s.listenAddr = l.Addr()
|
||||
s.m.Unlock()
|
||||
@@ -57,10 +57,10 @@ func (s *servergRPC) Serve(l net.Listener) error {
|
||||
}
|
||||
|
||||
// ServePacket implements caddy.UDPServer interface.
|
||||
func (s *servergRPC) ServePacket(p net.PacketConn) error { return nil }
|
||||
func (s *ServergRPC) ServePacket(p net.PacketConn) error { return nil }
|
||||
|
||||
// Listen implements caddy.TCPServer interface.
|
||||
func (s *servergRPC) Listen() (net.Listener, error) {
|
||||
func (s *ServergRPC) Listen() (net.Listener, error) {
|
||||
|
||||
// The *tls* middleware must make sure that multiple conflicting
|
||||
// TLS configuration return an error: it can only be specified once.
|
||||
@@ -88,11 +88,11 @@ func (s *servergRPC) Listen() (net.Listener, error) {
|
||||
}
|
||||
|
||||
// ListenPacket implements caddy.UDPServer interface.
|
||||
func (s *servergRPC) ListenPacket() (net.PacketConn, error) { return nil, nil }
|
||||
func (s *ServergRPC) ListenPacket() (net.PacketConn, error) { return nil, nil }
|
||||
|
||||
// OnStartupComplete lists the sites served by this server
|
||||
// and any relevant information, assuming Quiet is false.
|
||||
func (s *servergRPC) OnStartupComplete() {
|
||||
func (s *ServergRPC) OnStartupComplete() {
|
||||
if Quiet {
|
||||
return
|
||||
}
|
||||
@@ -102,7 +102,7 @@ func (s *servergRPC) OnStartupComplete() {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *servergRPC) Stop() (err error) {
|
||||
func (s *ServergRPC) Stop() (err error) {
|
||||
s.m.Lock()
|
||||
defer s.m.Unlock()
|
||||
if s.grpcServer != nil {
|
||||
@@ -114,7 +114,7 @@ func (s *servergRPC) Stop() (err error) {
|
||||
// Query is the main entry-point into the gRPC server. From here we call ServeDNS like
|
||||
// any normal server. We use a custom responseWriter to pick up the bytes we need to write
|
||||
// back to the client as a protobuf.
|
||||
func (s *servergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket, error) {
|
||||
func (s *ServergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket, error) {
|
||||
msg := new(dns.Msg)
|
||||
err := msg.Unpack(in.Msg)
|
||||
if err != nil {
|
||||
@@ -144,7 +144,7 @@ func (s *servergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket
|
||||
return &pb.DnsPacket{Msg: packed}, nil
|
||||
}
|
||||
|
||||
func (s *servergRPC) Shutdown() error {
|
||||
func (s *ServergRPC) Shutdown() error {
|
||||
if s.grpcServer != nil {
|
||||
s.grpcServer.Stop()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user