From cf82d0bfbb8fac27da041dfa025012be4e4eb601 Mon Sep 17 00:00:00 2001
From: linxiaozhi <linxiaozhi@linxiaozhi.com>
Date: Mon, 18 Feb 2019 02:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/server.go | 5 ++---
 jobs/job.go           | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/controllers/server.go b/controllers/server.go
index 344b1aa..f5109b7 100644
--- a/controllers/server.go
+++ b/controllers/server.go
@@ -168,13 +168,12 @@ func RemoteCommandByTelnetPassword(servers *models.TaskServer) error {
 
 	addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port)
 	conn, err := gote.DialTimeout("tcp", addr, time.Second*10)
-
-	defer conn.Close()
-
 	if err != nil {
 		return err
 	}
 
+	defer conn.Close()
+
 	buf := make([]byte, 4096)
 	_, err = conn.Read(buf)
 	if err != nil {
diff --git a/jobs/job.go b/jobs/job.go
index 80c67e8..7bc9671 100644
--- a/jobs/job.go
+++ b/jobs/job.go
@@ -233,13 +233,12 @@ func RemoteCommandJobByTelnetPassword(id int, name string, command string, serve
 
 		addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port)
 		conn, err := gote.DialTimeout("tcp", addr, timeout)
-
-		defer conn.Close()
-
 		if err != nil {
 			return "", "", err, false
 		}
 
+		defer conn.Close()
+
 		buf := make([]byte, 4096)
 		_, err = conn.Read(buf)
 		if err != nil {