From c79d961e01f8dee60df488f87312f8bf97e2967c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 28 十月 2019 14:52:16 +0800
Subject: [PATCH] 绘图比例使用float64而不是int32

---
 labelFilter/req.go |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/labelFilter/req.go b/labelFilter/req.go
index fe5fb04..617bf65 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -1,22 +1,21 @@
 package labelFilter
 
 import (
+	"basic.com/valib/logger.git"
 	"fmt"
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"nanomsg.org/go-mangos"
 	"nanomsg.org/go-mangos/protocol/rep"
 	"nanomsg.org/go-mangos/protocol/req"
 	"nanomsg.org/go-mangos/transport/ipc"
 	"nanomsg.org/go-mangos/transport/tcp"
-	"os"
-	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"time"
 )
 
 func Die(format string, v ...interface{}) {
 	logger.Info("+++++++",format)
-	os.Exit(1)
+	//os.Exit(1)
 }
 
 func date() string {
@@ -53,7 +52,7 @@
 	}
 }
 
-func Push(url string,data ruleserver.ResultMsg) {
+func Push(url string,data structure.ResultMsg) {
 	var sock mangos.Socket
 	var err error
 	var msg []byte
@@ -61,20 +60,36 @@
 	if sock, err = req.NewSocket(); err != nil {
 		Die("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
 	}
+	errSize := sock.SetOption(mangos.OptionMaxRecvSize,30*1024*1024)
+	if errSize != nil {
+		fmt.Errorf("Failed set MaxRecvSize: %v", err)
+		return
+	}
+	errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 2000)
+	if errTimeOut != nil {
+		fmt.Errorf("Failed set MaxRecvDeadline: %v", err)
+		return
+	}
 	//sock.AddTransport(ipc.NewTransport())
 	sock.AddTransport(tcp.NewTransport())
 	if err = sock.Dial(url); err != nil {
 		Die("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
 	}
+	logger.Info("搴忓垪鍖栨暟鎹�")
+	bytes,err1 := proto.Marshal(data)
+	logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
+	if err1 != nil {
+		logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+	}
 	logger.Debug("鎺ㄩ�佹暟鎹�")
-	bytes,err := proto.Marshal(data)
+	//bytes := []byte("ndfasojdfaidsos")
 	if err = sock.Send(bytes); err != nil {
 		Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
 	}
 	if msg, err = sock.Recv(); err != nil {
 		Die("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
 	}
-	logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲",string(msg))
+	logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲",string(msg))
 	sock.Close()
 }
 

--
Gitblit v1.8.0