feat: 修复bug

i-Things · Nov 30, 2023 · cf89a10 · cf89a10
1 parent 8887e9d
commit cf89a10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/taosWS/connection.go b/taosWS/connection.go
@@ -59,7 +59,7 @@ func (tc *taosConn) generateReqID() uint64 {
 	return atomic.AddUint64(&tc.requestID, 1)
 }
 
-func newTaosConn(cfg *config) (*taosConn, error) {
+func newTaosConn(ctx context.Context, cfg *config) (*taosConn, error) {
 	endpointUrl := &url.URL{
 		Scheme: cfg.net,
 		Host:   fmt.Sprintf("%s:%d", cfg.addr, cfg.port),
@@ -91,7 +91,9 @@ func newTaosConn(cfg *config) (*taosConn, error) {
 
 	err = tc.connect()
 	if err != nil {
+		logx.WithContext(ctx).Errorf("websocket 连接失败,err:%v", err)
 		tc.Close()
+		return nil, err
 	}
 	return tc, nil
 }

diff --git a/taosWS/connector.go b/taosWS/connector.go
@@ -36,7 +36,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 	if c.cfg.writeTimeout == 0 {
 		c.cfg.writeTimeout = common.DefaultWriteWait
 	}
-	tc, err := newTaosConn(c.cfg)
+	tc, err := newTaosConn(ctx, c.cfg)
 	return tc, err
 }