Merge 66bd9b8 into daa4462

StyleTang · May 2, 2018 · 8601ff1 · 8601ff1
2 parents daa4462 + 66bd9b8
commit 8601ff1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/rocketmq-go/example/simple_producer.go b/rocketmq-go/example/simple_producer.go
@@ -43,5 +43,5 @@ func main() {
 	message.SetTopic(testTopic)
 	message.SetBody([]byte("hello World"))
 	result, err := producer.Send(message)
-	glog.Infof("test sendMessageResult result=[%s] err=[%s]", result.String(), err)
+	glog.Infof("test sendMessageResult result=[%s] err=[%v]", result.String(), err)
 }
diff --git a/rocketmq-go/example/simple_producer_consumer.go b/rocketmq-go/example/simple_producer_consumer.go
@@ -61,6 +61,6 @@ func main() {
 		message.SetTopic(testTopic)
 		message.SetBody([]byte("hello World"))
 		result, err := producer.Send(message)
-		glog.Infof("test sendMessageResult result=[%s] err=[%s]", result.String(), err)
+		glog.Infof("test sendMessageResult result=[%s] err=[%v]", result.String(), err)
 	}
 }
diff --git a/rocketmq-go/test/test_consume_message_retry.go b/rocketmq-go/test/test_consume_message_retry.go
@@ -66,7 +66,7 @@ func main() {
 	message.SetBody([]byte(testMessageBody))
 	message.SetTag(tag)
 	result, err := producer.Send(message)
-	glog.Infof("test sendMessageResult messageId=[%s] err=[%s]", result.MsgID(), err)
+	glog.Infof("test sendMessageResult messageId=[%s] err=[%v]", result.MsgID(), err)
 	for i := 0; i < 3; i++ {
 		select {
 		case <-chResult:

diff --git a/rocketmq-go/test/test_delay_message_send_and_receive.go b/rocketmq-go/test/test_delay_message_send_and_receive.go
@@ -68,7 +68,7 @@ func main() {
 	result, err := producer.Send(message)
 	startTime = time.Now()
 	messageId = result.MsgID()
-	glog.Infof("test sendMessageResult messageId=[%s] err=[%s]", result.MsgID(), err)
+	glog.Infof("test sendMessageResult messageId=[%s] err=[%v]", result.MsgID(), err)
 	select {
 	case <-chResult:
 	case <-time.After(time.Second * 30):

diff --git a/rocketmq-go/test/test_rocketmq_serialize_message_send_and_receive.go b/rocketmq-go/test/test_rocketmq_serialize_message_send_and_receive.go
@@ -61,7 +61,7 @@ func main() {
 		message.SetBody([]byte(messageBody))
 		message.SetTag(tag)
 		result, err := producer.Send(message)
-		glog.Infof("test sendMessageResult messageId=[%s] err=[%s]", result.MsgID(), err)
+		glog.Infof("test sendMessageResult messageId=[%s] err=[%v]", result.MsgID(), err)
 	}
 	for i := 0; i < messageCount; i++ {
 		select {

diff --git a/rocketmq-go/test/test_send_and_receive_compress_message.go b/rocketmq-go/test/test_send_and_receive_compress_message.go
@@ -67,7 +67,7 @@ func main() {
 	message.SetBody([]byte(bigMessageBody))
 	message.SetTag("compress_message_test")
 	result, err := producer.Send(message)
-	glog.Infof("test sendMessageResult messageId=[%s] err=[%s]", result.MsgID(), err)
+	glog.Infof("test sendMessageResult messageId=[%s] err=[%v]", result.MsgID(), err)
 	select {
 	case <-chResult:
 	case <-time.After(time.Second * 30):

diff --git a/rocketmq-go/test/test_send_and_receive_tag_message.go b/rocketmq-go/test/test_send_and_receive_tag_message.go
@@ -60,7 +60,7 @@ func main() {
 		message.SetBody([]byte("Hello world"))
 		message.SetTag("tag" + util.IntToString(i))
 		result, err := producer.Send(message)
-		glog.Infof("test sendMessageResult messageId=[%s] err=[%s]", result.MsgID(), err)
+		glog.Infof("test sendMessageResult messageId=[%s] err=[%v]", result.MsgID(), err)
 	}
 	for i := 0; i < 3; i++ {
 		select {

diff --git a/rocketmq-go/util/ip.go b/rocketmq-go/util/ip.go
@@ -69,7 +69,7 @@ func getIp() (ip net.IP) {
 	return
 }
 func isIntranetIpv4(ip string) bool {
-	if strings.HasPrefix(ip, "192.168.") || strings.HasPrefix(ip, "169.254.") {
+	if strings.HasPrefix(ip, "192.168.") || strings.HasPrefix(ip, "169.254.") || strings.HasPrefix(ip, "172.") || strings.HasPrefix(ip, "10.") {
 		return true
 	}
 	return false