From c29dd2ad3618205e154b2c2210b4e215857d42be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B2=B3?= <shixi_liuhe1@staff.sina.com.cn>
Date: Sun, 31 Mar 2019 22:12:51 +0800
Subject: [PATCH] client  exit optimization

---
 client/control.go | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/client/control.go b/client/control.go
index d34165a..0cbbc3d 100644
--- a/client/control.go
+++ b/client/control.go
@@ -212,31 +212,26 @@ func NewConn(tp string, vkey string, server string, connType string, proxyUrl st
 	}
 	c := conn.NewConn(connection)
 	if _, err := c.Write([]byte(common.CONN_TEST)); err != nil {
-		logs.Error(err)
-		os.Exit(0)
+		return nil, err
 	}
 	if _, err := c.Write([]byte(crypt.Md5(version.GetVersion()))); err != nil {
-		logs.Error(err)
-		os.Exit(0)
+		return nil, err
 	}
 	if b, err := c.GetShortContent(32); err != nil || crypt.Md5(version.GetVersion()) != string(b) {
 		logs.Error("The client does not match the server version. The current version of the client is", version.GetVersion())
 		os.Exit(0)
 	}
 	if _, err := c.Write([]byte(common.Getverifyval(vkey))); err != nil {
-		logs.Error(err)
-		os.Exit(0)
+		return nil, err
 	}
 	if s, err := c.ReadFlag(); err != nil {
-		logs.Error(err)
-		os.Exit(0)
+		return nil, err
 	} else if s == common.VERIFY_EER {
 		logs.Error("Validation key %s incorrect", vkey)
 		os.Exit(0)
 	}
 	if _, err := c.Write([]byte(connType)); err != nil {
-		logs.Error(err)
-		os.Exit(0)
+		return nil, err
 	}
 	c.SetAlive(tp)