From a6b23c5eaf5a8b9265e13d3db370d45cfcd5bc21 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 16 五月 2019 15:06:06 +0800
Subject: [PATCH] add error判断

---
 nng.go |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nng.go b/nng.go
index 61b5e76..77619e3 100644
--- a/nng.go
+++ b/nng.go
@@ -52,8 +52,10 @@
 		return nil, errors.New("please init NNG first")
 	}
 	if _, err := n.sock.GetOption(mangos.OptionRaw); err == nil {
-		msg, err := n.sock.RecvMsg()
-		return msg.Body, err
+		if msg, err := n.sock.RecvMsg(); err == nil {
+			return msg.Body, err
+		}
+		return nil, err
 	}
 	return n.sock.Recv()
 }
@@ -126,14 +128,14 @@
 		sock.Close()
 		return err
 	}
-	// if err = sock.SetOption(mangos.OptionRecvDeadline, time.Second); err != nil {
-	// 	sock.Close()
-	// 	return err
-	// }
-	// if err = sock.SetOption(mangos.OptionSendDeadline, time.Second); err != nil {
-	// 	sock.Close()
-	// 	return err
-	// }
+	if err = sock.SetOption(mangos.OptionRecvDeadline, time.Second); err != nil {
+		sock.Close()
+		return err
+	}
+	if err = sock.SetOption(mangos.OptionSendDeadline, time.Second); err != nil {
+		sock.Close()
+		return err
+	}
 	if err = sock.SetOption(mangos.OptionRaw, true); err != nil {
 		sock.Close()
 		return err

--
Gitblit v1.8.0