From 5083277b55e704606a1d198e470f143780e45ce7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期六, 29 六月 2019 18:55:35 +0800
Subject: [PATCH] deploy 203
---
/dev/null | 2 +-
go.sum | 2 ++
test | 0
go.mod | 1 +
main.go | 6 +++++-
util/sqlite.go | 16 ++++++++++------
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index 7fdfa25..c6f5ccd 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc
basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce
+ basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
github.com/ajg/form v1.5.1 // indirect
github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.3.1
diff --git a/go.sum b/go.sum
index 20d219d..29ce63f 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@
basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f/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/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=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
diff --git a/gopherdiscovery b/gopherdiscovery
deleted file mode 160000
index 15d89d8..0000000
--- a/gopherdiscovery
+++ /dev/null
@@ -1 +1 @@
-Subproject commit 15d89d8b4e28346e59de5201d3b6d7b7f982979e
+Subproject commit 0000000000000000000000000000000000000000
diff --git a/main.go b/main.go
index be51039..ffa4372 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,9 @@
"fmt"
"log"
"net/http"
+ "flag"
_ "net/http/pprof"
+ "time"
"github.com/long/test/camera"
"github.com/long/test/sdk"
@@ -19,10 +21,12 @@
var initchan = make(chan bool)
func main() {
+ flag.Parse()
+ time.Sleep(time.Second)
// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
go func() {
- log.Println(http.ListenAndServe("0.0.0.0:6060", nil))
+ log.Println(http.ListenAndServe("0.0.0.0:6061", nil))
}()
go util.Init(initchan)
diff --git a/test b/test
index 27cbc07..346e4e7 100755
--- a/test
+++ b/test
Binary files differ
diff --git a/util/sqlite.go b/util/sqlite.go
index f06b3e3..04d4b84 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -3,10 +3,11 @@
import (
"fmt"
+ "flag"
"basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
"github.com/gogo/protobuf/proto"
- "github.com/long/test/gopherdiscovery"
+ "basic.com/valib/gopherdiscovery.git"
)
/*************************
@@ -28,17 +29,19 @@
var Sdklist []string
var Sdkinfos []protomsg.Sdk
-var urlServer = "tcp://192.168.1.11:40007"
-var urlPubSub = "tcp://192.168.1.11:50007"
+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:5007", "heartbeat pubsub address of url server")
-//var urlServer = "tcp://127.0.0.1:40007"
-//var urlPubSub = "tcp://127.0.0.1:50007"
+var dbip = flag.String("dbip","127.0.0.1","address of database ip")
+var dbport = flag.Int("dbport", 8001, "port of database port")
var Sdkflag = make(chan bool)
var TaskSdkflag = make(chan bool)
var Cameraflag = make(chan bool)
var newsdkmsg = &protomsg.DbChangeMessage{}
+
+
func processinit(initchan chan bool) {
CameraIds = camval.FindAll()
@@ -90,7 +93,8 @@
}
func Init(initchan chan bool) {
- clientOne, _ := gopherdiscovery.ClientWithSub(urlServer, urlPubSub, "ip:192.168.1.124")
+ dbapi.Init(*dbip, *dbport)
+ clientOne, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
recvinit := clientOne.HeartBeatMsg()
fmt.Println(<-recvinit)
processinit(initchan)
--
Gitblit v1.8.0