public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化]设备数据上传并发处理，添加队列，以及并发数控制

Browse Source
This commit is contained in:
PandaX
2023-11-28 18:08:49 +08:00
parent 287c8a1b05
commit fd44f11c4b
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iothub/server/emqxserver/hook.go
View File

@@ -89,7 +89,7 @@ func (s *HookGrpcService) OnClientConnected(ctx context.Context, in *exhook2.Cli
//添加连接ID //添加连接ID
mqttclient.MqttClient.Store(etoken.DeviceId, in.Clientinfo.Clientid) mqttclient.MqttClient.Store(etoken.DeviceId, in.Clientinfo.Clientid)
data := netbase.CreateConnectionInfo(message.ConnectMes, "mqtt", in.Clientinfo.Clientid, in.Clientinfo.Peerhost, etoken) data := netbase.CreateConnectionInfo(message.ConnectMes, "mqtt", in.Clientinfo.Clientid, in.Clientinfo.Peerhost, etoken)
s.HookService.MessageCh <- data s.HookService.Queue.Queue(data)
return &exhook2.EmptySuccess{}, nil return &exhook2.EmptySuccess{}, nil
} }
@@ -104,7 +104,7 @@ func (s *HookGrpcService) OnClientDisconnected(ctx context.Context, in *exhook2.
//删除连接ID //删除连接ID
mqttclient.MqttClient.Delete(etoken.DeviceId) mqttclient.MqttClient.Delete(etoken.DeviceId)
data := netbase.CreateConnectionInfo(message.DisConnectMes, "mqtt", in.Clientinfo.Clientid, in.Clientinfo.Peerhost, etoken) data := netbase.CreateConnectionInfo(message.DisConnectMes, "mqtt", in.Clientinfo.Clientid, in.Clientinfo.Peerhost, etoken)
s.HookService.MessageCh <- data s.HookService.Queue.Queue(data)
return &exhook2.EmptySuccess{}, nil return &exhook2.EmptySuccess{}, nil
} }

6
iothub/server/httpserver/hook.go
View File

@@ -44,7 +44,7 @@ func InitHttpHook(addr string, hs *hook_message_work.HookService) {
if etoken != nil { if etoken != nil {
data := netbase.CreateConnectionInfo(message.DisConnectMes, "http", conn.RemoteAddr().String(), conn.RemoteAddr().String(), etoken.(*model.DeviceAuth)) data := netbase.CreateConnectionInfo(message.DisConnectMes, "http", conn.RemoteAddr().String(), conn.RemoteAddr().String(), etoken.(*model.DeviceAuth))
activeConnections.Delete(conn.RemoteAddr().String()) activeConnections.Delete(conn.RemoteAddr().String())
service.HookService.MessageCh <- data service.HookService.Queue.Queue(data)
} }
} }
} }
@@ -87,7 +87,7 @@ func (hhs *HookHttpService) hook(req *restful.Request, resp *restful.Response) {
if !ok { if !ok {
activeConnections.Store(req.Request.RemoteAddr, etoken) activeConnections.Store(req.Request.RemoteAddr, etoken)
data := netbase.CreateConnectionInfo(message.ConnectMes, "http", req.Request.RemoteAddr, req.Request.RemoteAddr, etoken) data := netbase.CreateConnectionInfo(message.ConnectMes, "http", req.Request.RemoteAddr, req.Request.RemoteAddr, etoken)
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
} }
marshal, _ := json.Marshal(upData) marshal, _ := json.Marshal(upData)
data := &netbase.DeviceEventInfo{ data := &netbase.DeviceEventInfo{
@@ -122,6 +122,6 @@ func (hhs *HookHttpService) hook(req *restful.Request, resp *restful.Response) {
resp.Write([]byte("路径上报类型错误")) resp.Write([]byte("路径上报类型错误"))
return return
} }
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
io.WriteString(resp, "ok") io.WriteString(resp, "ok")
} }

6
iothub/server/tcpserver/hook.go
View File

@@ -58,7 +58,7 @@ func (hhs *HookTcpService) hook() {
//设置断开连接 //设置断开连接
if isAuth { if isAuth {
data := netbase.CreateConnectionInfo(message.DisConnectMes, "tcp", hhs.conn.RemoteAddr().String(), hhs.conn.RemoteAddr().String(), etoken) data := netbase.CreateConnectionInfo(message.DisConnectMes, "tcp", hhs.conn.RemoteAddr().String(), hhs.conn.RemoteAddr().String(), etoken)
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
} }
tcpclient.TcpClient.Delete(etoken.DeviceId) tcpclient.TcpClient.Delete(etoken.DeviceId)
isAuth = false isAuth = false
@@ -72,7 +72,7 @@ func (hhs *HookTcpService) hook() {
if auth { if auth {
global.Log.Infof("TCP协议 设备%s,认证成功", etoken.DeviceId) global.Log.Infof("TCP协议 设备%s,认证成功", etoken.DeviceId)
data := netbase.CreateConnectionInfo(message.ConnectMes, "tcp", hhs.conn.RemoteAddr().String(), hhs.conn.RemoteAddr().String(), etoken) data := netbase.CreateConnectionInfo(message.ConnectMes, "tcp", hhs.conn.RemoteAddr().String(), hhs.conn.RemoteAddr().String(), etoken)
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
isAuth = true isAuth = true
tcpclient.TcpClient.Store(etoken.DeviceId, hhs.conn) tcpclient.TcpClient.Store(etoken.DeviceId, hhs.conn)
hhs.Send("success") hhs.Send("success")
@@ -92,7 +92,7 @@ func (hhs *HookTcpService) hook() {
data.Datas = fmt.Sprintf(`{"ts": "%s","rowdata": "%s"}`, ts, hexData) data.Datas = fmt.Sprintf(`{"ts": "%s","rowdata": "%s"}`, ts, hexData)
// etoken中添加设备标识 // etoken中添加设备标识
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
} }
} }

7
iothub/server/udpserver/hook.go
View File

@@ -43,7 +43,7 @@ func InitUdpHook(addr string, hs *hook_message_work.HookService) {
//设置断开连接 //设置断开连接
if isAuth, ok := authMap[client.AddrPort().String()]; ok && isAuth { if isAuth, ok := authMap[client.AddrPort().String()]; ok && isAuth {
data := netbase.CreateConnectionInfo(message.DisConnectMes, "udp", client.IP.String(), client.AddrPort().String(), etoken) data := netbase.CreateConnectionInfo(message.DisConnectMes, "udp", client.IP.String(), client.AddrPort().String(), etoken)
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
} }
udpclient.UdpClient.Delete(etoken.DeviceId) udpclient.UdpClient.Delete(etoken.DeviceId)
delete(authMap, client.AddrPort().String()) delete(authMap, client.AddrPort().String())
@@ -62,7 +62,7 @@ func InitUdpHook(addr string, hs *hook_message_work.HookService) {
data.Datas = fmt.Sprintf(`{"ts": "%s","rowdata": "%s"}`, ts, hexData) data.Datas = fmt.Sprintf(`{"ts": "%s","rowdata": "%s"}`, ts, hexData)
// etoken中添加设备标识 // etoken中添加设备标识
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
} else { } else {
token := string(buffer[:n]) token := string(buffer[:n])
etoken.GetDeviceToken(token) etoken.GetDeviceToken(token)
@@ -71,7 +71,8 @@ func InitUdpHook(addr string, hs *hook_message_work.HookService) {
if auth { if auth {
global.Log.Infof("UDP协议 设备%s,认证成功", etoken.DeviceId) global.Log.Infof("UDP协议 设备%s,认证成功", etoken.DeviceId)
data := netbase.CreateConnectionInfo(message.ConnectMes, "udp", client.IP.String(), client.AddrPort().String(), etoken) data := netbase.CreateConnectionInfo(message.ConnectMes, "udp", client.IP.String(), client.AddrPort().String(), etoken)
hhs.HookService.MessageCh <- data hhs.HookService.Queue.Queue(data)
authMap[client.AddrPort().String()] = true authMap[client.AddrPort().String()] = true
udpclient.UdpClient.Store(etoken.DeviceId, &udpclient.UdpClientT{ udpclient.UdpClient.Store(etoken.DeviceId, &udpclient.UdpClientT{
Conn: server.listener, Conn: server.listener,