From 5dafbd6b419cfc436aece4ac8b5580532f12afea Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期日, 16 六月 2019 13:41:50 +0800
Subject: [PATCH] release task
---
go.sum | 22 +++++++---------------
test | 0
gopherdiscovery | 2 +-
ls | 0
go.mod | 1 -
main.go | 9 ++++-----
sdk/sdk.go | 2 +-
util/sqlite.go | 10 +++++-----
camera/camera.go | 5 ++---
9 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 1f501f1..6432434 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -12,7 +12,7 @@
"context"
"fmt"
"sync"
- "time"
+ //"time"
)
//var SocketManage = make(map[string]SocketContext)
@@ -133,9 +133,8 @@
} else {
fmt.Println()
fmt.Println("============== one msg input ==========")
- fmt.Println("cameraid: ", cameraid, len(msg))
for _, taskid := range GetAlltask(cameraid) {
- time.Sleep(5 * time.Second)
+ //time.Sleep(5 * time.Second)
fmt.Println("cameraid: ", cameraid, " taskid: ", taskid)
Taskdolist(cameraid, taskid, msg)
}
diff --git a/go.mod b/go.mod
index e97ef4a..9051b1b 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,6 @@
require (
basic.com/dbapi.git v0.0.0-20190531051326-e49473afa5e9
basic.com/pubsub/protomsg.git v0.0.0-20190530084829-0ea842491a96
- basic.com/r/dbapi.git v0.0.0-20190531051326-e49473afa5e9
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce
github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.3.1
diff --git a/go.sum b/go.sum
index a4736da..aa563a6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,35 +1,26 @@
-basic.com/dbapi.git v0.0.0-20190523103034-c0d33072098b h1:gzr51BWE821BzyhRb0iiP5Wu/yXTkbfcz0BkzfjacMs=
-basic.com/dbapi.git v0.0.0-20190523103034-c0d33072098b/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/dbapi.git v0.0.0-20190531051326-e49473afa5e9 h1:1HIG2sEEYVUKL7nyJvURj/p24JpDwFwKE/XtatPsXVQ=
basic.com/dbapi.git v0.0.0-20190531051326-e49473afa5e9/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/protomsg.git v0.0.0-20190530084829-0ea842491a96 h1:7nkipxWDbIK4wRbLCZeUoGxzdEIxZFumSTM6xhfWiWM=
basic.com/pubsub/protomsg.git v0.0.0-20190530084829-0ea842491a96/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
-basic.com/r/dbapi.git v0.0.0-20190523103034-c0d33072098b h1:gIfKQeYTnO/y6mfrhx1ZPAyk0kgeocma9DXsgRdimoI=
-basic.com/r/dbapi.git v0.0.0-20190523103034-c0d33072098b/go.mod h1:5ia9iOg9Q8kvHoxo9rAOMF++ws7h1Mvj8b4L9C4c2MA=
-basic.com/r/dbapi.git v0.0.0-20190531051326-e49473afa5e9 h1:P6F1NSgD5VkWNqrgwT/6UU68tTGiUCULrFY/MxHlTk0=
-basic.com/r/dbapi.git v0.0.0-20190531051326-e49473afa5e9/go.mod h1:5ia9iOg9Q8kvHoxo9rAOMF++ws7h1Mvj8b4L9C4c2MA=
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce h1:/D6k+FVN1sMqLz6tMlsIl9bKwE2Mpc5d4QfPh0y4DSQ=
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190530055034-f8c281d054f6 h1:0srMU/gU5qyX726Jvi28dXN8StnmlVGRbj+SzI/8OVs=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190530055034-f8c281d054f6/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190530092835-5bc9943400c2 h1:k5NHm1Ch8cy+YNRxQuTEnRsd+VSXpqDK/UDUdjwG5qY=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190530092835-5bc9943400c2/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190531081358-bde1bf71186f h1:n1IcA2ZiLzKcPUOBA09CUlgyzAPEflfjoTf/gJOHgp8=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190531081358-bde1bf71186f/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs=
+github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877 h1:n65+IT/xy5+trHm3Zpg9+j7IO4n8pBcPzvaKbMolW8U=
github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877/go.mod h1:sgTk9wg3WurMlziuB3hcfgHYTz3pEkjQpSCTT8V2pW8=
+github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9 h1:uVRQSWD6TOlWlLJ7IYYmbjRr0Xg35ADFN89HGQLPFGI=
github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9/go.mod h1:vy1jksyhzuQOMkHXMEi+X2bZ47ZeCn3QTnYdFBesABs=
+github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290 h1:5zW+TRr0WH4uN72/E/XYwb1PcaYN5BIB/FUbcQ0nHr0=
github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290/go.mod h1:e9PZQr6zVezMTwj1v0j1YhGCNdS2zTCjXU9q9K+HHGk=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -40,4 +31,5 @@
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+nanomsg.org/go-mangos v1.4.0 h1:pVRLnzXePdSbhWlWdSncYszTagERhMG5zK/vXYmbEdM=
nanomsg.org/go-mangos v1.4.0/go.mod h1:MOor8xUIgwsRMPpLr9xQxe7bT7rciibScOqVyztNxHQ=
diff --git a/gopherdiscovery b/gopherdiscovery
index 3a37610..15d89d8 160000
--- a/gopherdiscovery
+++ b/gopherdiscovery
@@ -1 +1 @@
-Subproject commit 3a3761054bec493abbc66c75aada07c669f28c8f
+Subproject commit 15d89d8b4e28346e59de5201d3b6d7b7f982979e
diff --git a/ls b/ls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ls
diff --git a/main.go b/main.go
index 6578a71..be51039 100644
--- a/main.go
+++ b/main.go
@@ -10,6 +10,7 @@
"github.com/long/test/sdk"
"github.com/long/test/tasktag"
"github.com/long/test/util"
+
// "github.com/long/test/camera"
// "github.com/long/test/sdk"
// "github.com/long/test/tasktag"
@@ -29,10 +30,8 @@
fmt.Println("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
fmt.Println()
fmt.Println()
- fmt.Println()
- fmt.Println()
- sdk.Init() // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
- tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
- camera.Init() //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+ sdk.Init() // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+ tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
+ camera.Init() //鑾峰彇cid, taskid, sdkid ,鍏崇郴
select {}
}
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 3e5baef..bd933e7 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -118,7 +118,7 @@
// return sdkmsg
//}
- if val, ok := tasktag.TaskMapLab.Load(taskid); ok {
+ if val, ok := tasktag.TaskMapLab.Load(taskid); !ok {
sdkmsg.Tasklab = nil
return sdkmsg
diff --git a/test b/test
index 7f3f7c7..c3d91da 100755
--- a/test
+++ b/test
Binary files differ
diff --git a/util/sqlite.go b/util/sqlite.go
index 4f3e000..35a6a9a 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -4,7 +4,7 @@
"fmt"
"basic.com/pubsub/protomsg.git"
- "basic.com/r/dbapi.git"
+ "basic.com/dbapi.git"
"github.com/gogo/protobuf/proto"
"github.com/long/test/gopherdiscovery"
)
@@ -26,11 +26,11 @@
var TaskSdks []protomsg.TaskSdkInfo
var Sdklist []string
-//var urlServer = "tcp://192.168.1.11:40007"
-//var urlPubSub = "tcp://192.168.1.11:50007"
+var urlServer = "tcp://192.168.1.11:40007"
+var urlPubSub = "tcp://192.168.1.11:50007"
-var urlServer = "tcp://127.0.0.1:40007"
-var urlPubSub = "tcp://127.0.0.1:50007"
+//var urlServer = "tcp://127.0.0.1:40007"
+//var urlPubSub = "tcp://127.0.0.1:50007"
var Sdkflag = make(chan bool)
var TaskSdkflag = make(chan bool)
--
Gitblit v1.8.0