From 3bfcf573300238297b94c5b8a92e21869c9d6efa Mon Sep 17 00:00:00 2001 From: linxiaozhi Date: Mon, 18 Feb 2019 02:35:22 +0800 Subject: [PATCH] =?UTF-8?q?telnet=E8=AE=BE=E7=BD=AE=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/server.go | 4 ++-- jobs/job.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/server.go b/controllers/server.go index 4ab8d33..344b1aa 100644 --- a/controllers/server.go +++ b/controllers/server.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" "time" - "github.com/morganhein/go-telnet" + "github.com/linxiaozhi/go-telnet" "github.com/pkg/errors" ) @@ -167,7 +167,7 @@ func (self *ServerController) AjaxTestServer() { func RemoteCommandByTelnetPassword(servers *models.TaskServer) error { addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port) - conn, err := gote.Dial("tcp", addr) + conn, err := gote.DialTimeout("tcp", addr, time.Second*10) defer conn.Close() diff --git a/jobs/job.go b/jobs/job.go index 5b4be3b..80c67e8 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -26,8 +26,8 @@ import ( "golang.org/x/crypto/ssh" "encoding/json" "github.com/axgle/mahonia" - "github.com/morganhein/go-telnet" "github.com/pkg/errors" + "github.com/linxiaozhi/go-telnet" ) type Job struct { @@ -232,7 +232,7 @@ func RemoteCommandJobByTelnetPassword(id int, name string, command string, serve job.runFunc = func(timeout time.Duration) (string, string, error, bool) { addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port) - conn, err := gote.Dial("tcp", addr) + conn, err := gote.DialTimeout("tcp", addr, timeout) defer conn.Close()