chenshijun
2019-09-11 9389544d4cc56ef00084e8dbb6afb73e1ec00eca
改成使用valib的logger,增加一些日志输出
7个文件已修改
1个文件已删除
373 ■■■■ 已修改文件
camera/camera.go 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.mod 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
logger/logger.go 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk/sdk.go 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
taskpubsub 补丁 | 查看 | 原始文档 | blame | 历史
tasktag/tasktag.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
util/sqlite.go 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
camera/camera.go
@@ -2,16 +2,11 @@
import (
    "basic.com/valib/deliver.git"
    //"sync"
    "taskpubsub/logger"
    "basic.com/valib/logger.git"
    "basic.com/pubsub/protomsg.git"
    "github.com/gogo/protobuf/proto"
    "taskpubsub/sdk"
    "taskpubsub/util"
    "fmt"
    //"time"
)
const (
@@ -53,7 +48,7 @@
func createCameraRecvServerAndListen(id string) {
    if _, isExist := SocketManage[id]; !isExist { //不存在
        url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
        url := "ipc:///tmp/" + id + ".ipc"
        socket, err := util.NewSocketListen(int(deliver.PushPull), url)
        if err != nil {
            logger.Error("create socket error")
@@ -134,11 +129,12 @@
                continue
            }
            if faceExtractWebCID == imagemsg.Cid { //以图搜图
                logger.Info("id: ", faceExtractWebTaskID)
                doTaskList(imagemsg.Cid, "", faceExtractWebTaskID, recvmessage)
            } else {
                taskIDs := GetAllTaskByID(imagemsg.Cid)
                for _, taskID := range taskIDs {
                    logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
                    //logger.Info("id: ", imagemsg.Cid, " taskid: ", taskID)
                    doTaskList(imagemsg.Cid, "", taskID, recvmessage)
                }
            }
@@ -162,7 +158,7 @@
func doTaskList(cid string, caddr string, taskid string, data []byte) {
    //  数据加工(打标签)
    logger.Debug("taskid: ", taskid, "has ", len(data), "data[]byte")
    //logger.Info("taskid: ", taskid, "has ", len(data), "data[]byte")
    sdkmsg := sdk.ToSdkMsg(cid, caddr, taskid, data)
    if sdkmsg.Tasklab == nil {
        logger.Error(cid, " not have taskid: ", taskid)
@@ -171,11 +167,19 @@
    //  计算分发的主题
    SendTopic := sdk.GetSdkSendTopic(sdkmsg)
    logger.Debug(SendTopic)
    //logger.Info(SendTopic)
    if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
        logger.Info(SendTopic)
    }
    if _, ok := sdk.SdkMap[SendTopic]; ok {
        if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
            logger.Info(SendTopic)
        }
        sdk.SdkMap[SendTopic] <- sdkmsg
        logger.Debug("dispute sendtopic success", SendTopic)
        if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
            logger.Info("dispute sendtopic success", SendTopic)
        }
    } else {
        logger.Debug("分发的主题不存在")
        logger.Info("分发的主题不存在")
    }
}
go.mod
@@ -3,19 +3,18 @@
go 1.12
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-20190529080650-3e64847c9bce
    basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405
    basic.com/pubsub/protomsg.git v0.0.0-20190724114524-fc1623501c41
    basic.com/valib/deliver.git v0.0.0-20190716093339-1de0716341cd
    basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
    basic.com/valib/logger.git v0.0.0-20190904090733-b737ad2f8f18
    github.com/ajg/form v1.5.1 // indirect
    github.com/gogo/protobuf v1.2.1
    github.com/golang/protobuf v1.3.1
    github.com/golang/protobuf v1.3.2 // indirect
    github.com/gorilla/websocket v1.4.0 // indirect
    github.com/pierrec/lz4 v2.0.5+incompatible
    github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
    github.com/pierrec/lz4 v2.2.4+incompatible
    github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877 // indirect
    github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9 // indirect
    github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290 // indirect
    golang.org/x/net v0.0.0-20190522155817-f3200d17e092
    nanomsg.org/go-mangos v1.4.0
    nanomsg.org/go-mangos v1.4.0 // indirect
)
go.sum
@@ -1,53 +1,68 @@
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/dbapi.git v0.0.0-20190620073851-30a7d0574bbc h1:Dd4aSg+S8E1Kj49kTtHkRZpTeIJiM521i8wCkWMAmOg=
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65 h1:lVS4U8ASXzPwAOUPH7WaoeNTJQNUD6s9Wfd1b4KdreQ=
basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/protomsg.git v0.0.0-20190621090107-c5cf390e19bb h1:TCo2Oo2ZqHn+/WvfVCyQFSKHHps9gJZkC0D8MtTVcRs=
basic.com/pubsub/protomsg.git v0.0.0-20190621090107-c5cf390e19bb/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190626081036-01b33da00793 h1:dy4DnHRIcQf5DaiLl/IwE3fqZ6a21MXqMTFUmmVAG1c=
basic.com/pubsub/protomsg.git v0.0.0-20190626081036-01b33da00793/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f h1:mBsaoP1YlsFkgBwxm2KQ9U80Lj2b2wf3gowPlxf5ifQ=
basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190705101637-65381a182a3c h1:gVWzsRxEiQ7oqx0xHDHKbk1LF1hj32Xjp9n65K5Q3mI=
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-20190529080650-3e64847c9bce h1:/D6k+FVN1sMqLz6tMlsIl9bKwE2Mpc5d4QfPh0y4DSQ=
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405 h1:BJzdtGipKxQAaptrwUNOVQZ3Qx4jbeAf72wkqBmm5vE=
basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/protomsg.git v0.0.0-20190724093546-c998030fd269 h1:gXyJVIGOaECCtqzmG27AZc8Af7KToWbsfL9ulZosJM0=
basic.com/pubsub/protomsg.git v0.0.0-20190724093546-c998030fd269/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190724113021-21f454bb4964 h1:VGvEMKQnCE1X0BG1zDn0oRfS/+lRv9Ue7ec1mCj1slY=
basic.com/pubsub/protomsg.git v0.0.0-20190724113021-21f454bb4964/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190724114524-fc1623501c41 h1:Myyy43oOGfmtGsCSfKixqhMAJnYax8LUskRS2+xAtSo=
basic.com/pubsub/protomsg.git v0.0.0-20190724114524-fc1623501c41/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190716093339-1de0716341cd h1:xbHU3s8iyUbegjIOkrw2Z4rl+jGDPONKsqzdU6a+F+U=
basic.com/valib/deliver.git v0.0.0-20190716093339-1de0716341cd/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/logger.git v0.0.0-20190904090733-b737ad2f8f18 h1:lfBv29ApfEvecKkUIpKHHsS1qu74ZZGNmzZkazK9PJ8=
basic.com/valib/logger.git v0.0.0-20190904090733-b737ad2f8f18/go.mod h1:SPlOGUUlxCscwF1dkqmLb0oJXVqg1uJ8hsPXLFxrw1M=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
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/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
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/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
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/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU=
github.com/pierrec/lz4 v2.2.4+incompatible h1:Nqu6xTyB8QULqQb4eoa7pB8mIOPXwyi47u+hn45ykxs=
github.com/pierrec/lz4 v2.2.4+incompatible/go.mod h1:i5iVM8Tm8BGXjrx6RR3Wz6sQZlZvYr/QQ+kwo1ocGwk=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/schollz/progressbar/v2 v2.12.1/go.mod h1:fBI3onORwtNtwCWJHsrXtjE3QnJOtqIZrvr3rDaF7L0=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
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=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
nanomsg.org/go-mangos v1.4.0 h1:pVRLnzXePdSbhWlWdSncYszTagERhMG5zK/vXYmbEdM=
nanomsg.org/go-mangos v1.4.0/go.mod h1:MOor8xUIgwsRMPpLr9xQxe7bT7rciibScOqVyztNxHQ=
logger/logger.go
File was deleted
sdk/sdk.go
@@ -53,6 +53,8 @@
    // es
    SdkMap["es"] = make(chan protomsg.SdkMessage)
    logger.Info("create es channel: ")
    logger.Info("SdkMap:", SdkMap)
    go DealEsTopic()
    go autoUpdateSdk(util.Sdkflag)
@@ -175,11 +177,18 @@
func GetSdkSendTopic(sdkmsg protomsg.SdkMessage) (sendTopic string) {
    if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
        sendTopic = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
        if "Yolo" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
            "FaceDetect" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
            "FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype{
        //if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
            logger.Info("----------Sdktype:yitusoutu")
            logger.Info("分发的主题:", sendTopic, "!Sdktype:", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
        }
    } else {
        sendTopic = "es"
    }
    logger.Debug("分发的主题: ", sendTopic, "位置:", int(sdkmsg.Tasklab.Index)+1, "/", len(sdkmsg.Tasklab.Sdkinfos))
    return
    return sendTopic
}
func Recv(socket util.SocketContext) {
@@ -201,6 +210,9 @@
                repsdkmsg.Tasklab.Index++
                //调用计算函数, 分发给下一个主题
                nexttopic := GetSdkSendTopic(repsdkmsg)
                if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
                    logger.Info("nexttopic:", nexttopic)
                }
                SdkMap[nexttopic] <- repsdkmsg
            }
        }
@@ -223,10 +235,14 @@
                }
                if err := socket.Sock.Send(data); err != nil {
                    if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
                    logger.Error("failed send:sdkid=", sdkid)
                    }
                    continue
                }
                logger.Debug(sdkid, " send success: ", len(data))
                if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
                    logger.Info(sdkid, " send success: ", len(data))
                }
            } else {
                logger.Debug(sdkid, " 主题关闭, 关闭send()")
                return
taskpubsub
Binary files differ
tasktag/tasktag.go
@@ -36,6 +36,7 @@
            sdkinfowithtask := new(protomsg.SdkmsgWithTask)
            sdkinfowithtask.Ipcid = sdkinfo.IpcId
            sdkinfowithtask.Sdktype = sdkinfo.SdkType
            logger.Info("======sdkinfowithtask.Sdktype:", sdkinfowithtask.Sdktype)
            sdkinfowithtask.Sdkdata = make([]byte, 1)
            tl.Sdkinfos = append(tl.Sdkinfos, sdkinfowithtask)
        }
util/sqlite.go
@@ -29,10 +29,10 @@
var Sdklist []string
var Sdkinfos []protomsg.Sdk
var urlServer = flag.String("urlServer", "tcp://127.0.0.1:40007", "heartbeat address of url server")
var urlPubSub = flag.String("urlPubsub", "tcp://127.0.0.1:50007", "heartbeat pubsub address of url server")
var urlServer = flag.String("urlServer", "tcp://0.0.0.0:40007", "heartbeat address of url server")
var urlPubSub = flag.String("urlPubsub", "tcp://0.0.0.0:50007", "heartbeat pubsub address of url server")
var dbip = flag.String("dbip", "127.0.0.1", "address of database ip")
var dbip = flag.String("dbip", "0.0.0.0", "address of database ip")
var dbport = flag.Int("dbport", 8001, "port of database port")
var Sdkflag = make(chan bool)
@@ -66,29 +66,36 @@
        logger.Info("update camera")
        CameraIds = camval.FindAll()
        Cameraflag <- true
        logger.Info(CameraIds)
        logger.Info("update camera finish.")
    case protomsg.TableChanged_T_CameraTask:
        logger.Info("update cameratask")
        CameraTasks = camval.FindAllCameraAndTask()
        logger.Info(CameraTasks)
        logger.Info("update cameratask finished!")
    case protomsg.TableChanged_T_TaskSdk:
        logger.Info("update tasksdk")
        TaskSdks = taskapi.FindAllTaskSdkRun()
        TaskSdkflag <- true
        logger.Info(TaskSdks)
        logger.Info("update tasksdk finished!")
    case protomsg.TableChanged_T_Sdk:
        logger.Info("update sdk")
        Sdklist = sdkapi.GetAllSdkIds()
        Sdkinfos = sdkapi.FindAll("")
        Sdkflag <- true
        logger.Info(Sdklist)
        logger.Info(Sdkinfos)
        logger.Info("update Sdkinfos finished!")
    default:
        logger.Info("unknow type operation")
    }
    logger.Info(newsdkmsg)
    //logger.Info(newsdkmsg)
}
func Init(initchan chan bool) {