添加测试tcp client断开后,关闭channle
This commit is contained in:
parent
b06a2aa937
commit
419d1a21a5
|
@ -92,7 +92,8 @@
|
|||
]
|
||||
},
|
||||
"devices_list": [
|
||||
["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"]
|
||||
["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"],
|
||||
["EB5B0798-9B7F-474E-AAB8-467FD5FE1293", "loraport", "yunhorn_kgl_l_v1", "2"]
|
||||
],
|
||||
"serialports_list": {
|
||||
"loraport": {
|
||||
|
|
BIN
db/gateway.db
BIN
db/gateway.db
Binary file not shown.
|
@ -41,6 +41,9 @@ func build_data(code int, data []Device) []byte {
|
|||
R_data.GATEWAY_INFO = conf.GATEWAY_INFO
|
||||
DEVICEDATAS.RLock()
|
||||
for _, i := range DEVICEDATAS.DATA {
|
||||
log.Println("=========================================")
|
||||
log.Println(i)
|
||||
log.Println("=========================================")
|
||||
R_data.DEVICES = append(R_data.DEVICES, i)
|
||||
}
|
||||
DEVICEDATAS.RUnlock()
|
||||
|
|
9
main.go
9
main.go
|
@ -13,10 +13,15 @@ func main() {
|
|||
go gw_router()
|
||||
go serial_run()
|
||||
c := cron.New()
|
||||
send_data(1001)
|
||||
// send_data(1001)
|
||||
c.AddFunc("0, *, *, *, *, *", func() {
|
||||
send_data(1001)
|
||||
// send_data(1001)
|
||||
})
|
||||
// devices := []Device{}
|
||||
c.AddFunc("*/10, *, *, *, *, *", func(){
|
||||
// log.Println(string(build_data(1001,devices)))
|
||||
})
|
||||
|
||||
c.AddFunc("0, */10, *, *, *, *", savedata_cron)
|
||||
c.AddFunc("0, 0, 0, *, *, *", insertdata)
|
||||
c.AddFunc("0, 0, *, *, *, *", get_weather)
|
||||
|
|
11
tcpserver.go
11
tcpserver.go
|
@ -22,6 +22,8 @@ func handleConn(conn net.Conn) {
|
|||
go readConn(conn, readChan, stopChan)
|
||||
// go writeConn(conn, writeChan, stopChan)
|
||||
|
||||
var heartbeat []byte = []byte{0x01}
|
||||
|
||||
for {
|
||||
select {
|
||||
case readStr := <-readChan:
|
||||
|
@ -33,6 +35,13 @@ func handleConn(conn net.Conn) {
|
|||
if stop {
|
||||
break
|
||||
}
|
||||
case <-time.After(5000 * time.Millisecond):
|
||||
n,err := conn.Write(heartbeat)
|
||||
if err != nil{
|
||||
log.Println("write msg error!",err)
|
||||
}else{
|
||||
log.Println("write msg success!",n)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -56,7 +65,7 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
|
|||
//strData := string(Rdata)
|
||||
//Rdata = make([]byte,0)
|
||||
//log.Println("Received:", strData)
|
||||
|
||||
|
||||
//readChan <- Rdata
|
||||
//Rdata = make([]byte,0)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue