Merge pull request #138 from jumpserver/dev

Dev

pkg/proxy/parser.go

@@ -55,8 +55,8 @@ type Parser struct {
 
 	command         string
 	output          string
-	cmdInputParser  CmdParser
-	cmdOutputParser CmdParser
+	cmdInputParser  *CmdParser
+	cmdOutputParser *CmdParser
 
 	cmdFilterRules []model.SystemUserFilterRule
 	closed         chan struct{}

pkg/proxy/parsercmd.go

@@ -12,10 +12,10 @@ import (
 
 var ps1Pattern = regexp.MustCompile(`^\[?.*@.*\]?[\\$#]\s|mysql>\s`)
 
-func NewCmdParser(sid, name string) CmdParser {
+func NewCmdParser(sid, name string) *CmdParser {
 	parser := CmdParser{id: sid, name:name}
 	parser.initial()
-	return parser
+	return &parser
 }
 
 type CmdParser struct {

pkg/srvconn/connmanager.go

@@ -196,12 +196,14 @@ func (sc *SSHClientConfig) Dial() (client *gossh.Client, err error) {
 		}
 		proxySock, err := proxyClient.Dial("tcp", net.JoinHostPort(sc.Host, sc.Port))
 		if err != nil {
-			err = errors.New("connect proxy host error 2: " + err.Error())
-			logger.Error("Connect proxy host error 2: ", err.Error())
+			err = errors.New(fmt.Sprintf("tcp connect host %s:%s error 2: %s", sc.Host, sc.Port, err.Error()))
+			logger.Errorf("Tcp connect host %s:%s error 2: %s", sc.Host, sc.Port, err.Error())
 			return client, err
 		}
 		proxyConn, chans, reqs, err := gossh.NewClientConn(proxySock, net.JoinHostPort(sc.Host, sc.Port), cfg)
 		if err != nil {
+			err = errors.New(fmt.Sprintf("ssh connect host %s:%s error 3: %s", sc.Host, sc.Port, err.Error()))
+			logger.Errorf("SSH Connect host %s:%s error 3: %s", sc.Host, sc.Port, err.Error())
 			return client, err
 		}
 		sc.proxyConn = proxyConn