From 1486ae25c025706f915abe7638367453c878165a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 17 Apr 2018 17:48:30 -0700
Subject: [PATCH] Tidy up last change to socket listener/writer

---
 plugins/inputs/socket_listener/socket_listener.go | 9 +--------
 plugins/outputs/socket_writer/socket_writer.go    | 7 ++-----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go
index 011a1edb4..076e1f4b8 100644
--- a/plugins/inputs/socket_listener/socket_listener.go
+++ b/plugins/inputs/socket_listener/socket_listener.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"crypto/tls"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -338,14 +339,6 @@ func (uc unixCloser) Close() error {
 	return err
 }
 
-func (uc unixCloser) Accept() (net.Conn, error) {
-	return uc.closer.(net.Listener).Accept()
-}
-
-func (uc unixCloser) Addr() net.Addr {
-	return uc.closer.(net.Listener).Addr()
-}
-
 func init() {
 	inputs.Add("socket_listener", func() telegraf.Input { return newSocketListener() })
 }
diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go
index 855df4a8f..382aad266 100644
--- a/plugins/outputs/socket_writer/socket_writer.go
+++ b/plugins/outputs/socket_writer/socket_writer.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"crypto/tls"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -70,11 +71,6 @@ func (sw *SocketWriter) SetSerializer(s serializers.Serializer) {
 }
 
 func (sw *SocketWriter) Connect() error {
-	var (
-		c   net.Conn
-		err error
-	)
-
 	spl := strings.SplitN(sw.Address, "://", 2)
 	if len(spl) != 2 {
 		return fmt.Errorf("invalid address: %s", sw.Address)
@@ -85,6 +81,7 @@ func (sw *SocketWriter) Connect() error {
 		return err
 	}
 
+	var c net.Conn
 	if tlsCfg == nil {
 		c, err = net.Dial(spl[0], spl[1])
 	} else {