From a464ae7f01e47395f3a5386d1b1d0b5f4223a29a Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 05 九月 2019 15:02:25 +0800
Subject: [PATCH] update dbapi
---
sdk/sdk.go | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 8fdbc9c..43e7c64 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -4,13 +4,15 @@
"fmt"
// "golang.org/x/sys/unix"
- "github.com/gogo/protobuf/proto"
"taskpubsub/tasktag"
"taskpubsub/util"
+ "github.com/gogo/protobuf/proto"
+
+ "taskpubsub/logger"
+
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "taskpubsub/logger"
)
const (
@@ -90,11 +92,13 @@
url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPush)
m := deliver.PushPull
- if shm{
+ if shm {
m = deliver.Shm
url = id + postPush
- // unix.Unlink("/dev/shm/" + url)
}
+
+ fmt.Println("SDK URL: ", url)
+
socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
delete(SdkMap, id)
@@ -114,11 +118,10 @@
url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPull)
m := deliver.PushPull
- if shm{
+ if shm {
m = deliver.Shm
url = id + postPull
- // unix.Unlink("/dev/shm/" + url)
}
socket, err := util.NewSocketListen(int(m), url, shm)
@@ -203,6 +206,9 @@
}
func Recv(socket util.SocketContext) {
+
+ tryCount := 0
+
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
@@ -211,6 +217,18 @@
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)
+ fmt.Println("SDK RECV SHM TRY :", tryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
continue
} else {
err = proto.Unmarshal(msg, &repsdkmsg)
@@ -229,6 +247,8 @@
func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
+ tryCount := 0
+
for {
select {
case <-socket.Context.Done():
@@ -244,6 +264,21 @@
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)
+ fmt.Println("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
+
continue
}
logger.Debug(sdkid, " send success: ", len(data))
--
Gitblit v1.8.0