zhangmeng
2019-08-30 8a35494c2dfd5a0d51d802971ae0aff92e6dd446
update deliver nng
4个文件已修改
12 ■■■■ 已修改文件
camera/camera.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.mod 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk/sdk.go 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
camera/camera.go
@@ -137,6 +137,8 @@
        default:
            if recvmessage, err = socket.Sock.Recv(); err != nil {
                //logger.Error("[camera] err is: ", err)
                // fmt.Println("CAMERA RECV ERROR: ", err)
                if socket.UseSHM {
                    if tryCount > util.SHMMaxTryCount {
                        socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
go.mod
@@ -5,7 +5,7 @@
require (
    basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65
    basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2
    basic.com/valib/deliver.git v0.0.0-20190827070620-058b21100da6
    basic.com/valib/deliver.git v0.0.0-20190830021714-971bd16379d4
    basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
    basic.com/valib/shm.git v0.0.0-20190829074754-ad2e00879627 // indirect
    github.com/ajg/form v1.5.1 // indirect
go.sum
@@ -14,8 +14,8 @@
basic.com/pubsub/protomsg.git v0.0.0-20190705101637-65381a182a3c/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 h1:ygh9CQPS48KmXv+PNUrOcrMqIiDZOs11apnQdu9oGEY=
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190827070620-058b21100da6 h1:EhdO5dTDG0o4kOjfoT0e7CX18WxvJVnMSgY5cRqwKao=
basic.com/valib/deliver.git v0.0.0-20190827070620-058b21100da6/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
basic.com/valib/deliver.git v0.0.0-20190830021714-971bd16379d4 h1:ObqyZFc9ZIPJHtMT0Td2VqEZfrfLW1QkkeHuguCYCvc=
basic.com/valib/deliver.git v0.0.0-20190830021714-971bd16379d4/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 h1:3hejanzPEBvZSSvjIqayB83/6/6SLLrX9oNZAdiYELg=
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs=
basic.com/valib/shm.git v0.0.0-20190829074754-ad2e00879627 h1:y0t0XG2uPSygF+hiSdLP3Lr959tip/FDPYJpHhbKRec=
sdk/sdk.go
@@ -217,6 +217,7 @@
            return
        default:
            if msg, err := socket.Sock.Recv(); err != nil {
                // fmt.Println("SDK RECV ERROR: ", err)
                if socket.UseSHM {
                    if tryCount > util.SHMMaxTryCount {
                        socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
@@ -264,6 +265,8 @@
                if err := socket.Sock.Send(data); err != nil {
                    logger.Error("failed send:sdkid=", sdkid)
                    // fmt.Println("SDK SEND ERROR: ", err)
                    if socket.UseSHM {
                        if tryCount > util.SHMMaxTryCount {
                            socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
@@ -275,6 +278,7 @@
                        }
                        tryCount++
                    }
                    continue
                }
                logger.Debug(sdkid, " send success: ", len(data))