|
@@ -160,7 +160,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
}
|
|
}
|
|
|
|
|
|
if len(msg.ClientID) < 1 || len(msg.ClientID) > 23 {
|
|
if len(msg.ClientID) < 1 || len(msg.ClientID) > 23 {
|
|
- server.Log.Warn("invalid ClientID length: %d", len(msg.ClientID))
|
|
|
|
|
|
+ server.Log.Errorf("invalid ClientID length: %d", len(msg.ClientID))
|
|
ret = RetCodeIdentifierRejected
|
|
ret = RetCodeIdentifierRejected
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
@@ -168,14 +168,14 @@ func (c *Connection) RcvMsgFromClient() {
|
|
|
|
|
|
DeviceID, err := ClientIDToDeviceID(msg.ClientID)
|
|
DeviceID, err := ClientIDToDeviceID(msg.ClientID)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warn("invalid Identify: %d", ret)
|
|
|
|
|
|
+ server.Log.Errorf("invalid Identify: %d", ret)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
device := &models.Device{}
|
|
device := &models.Device{}
|
|
err = server.RPCCallByName(nil, rpcs.RegistryServerName, "Registry.FindDeviceById", DeviceID, device)
|
|
err = server.RPCCallByName(nil, rpcs.RegistryServerName, "Registry.FindDeviceById", DeviceID, device)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warn("device not found %d", ret, DeviceID)
|
|
|
|
|
|
+ server.Log.Errorf("device not found %d", ret, DeviceID)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -183,21 +183,21 @@ func (c *Connection) RcvMsgFromClient() {
|
|
c.VendorId = device.VendorID
|
|
c.VendorId = device.VendorID
|
|
token, err := hex.DecodeString(msg.Password)
|
|
token, err := hex.DecodeString(msg.Password)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warn("token format error : %v", err)
|
|
|
|
|
|
+ server.Log.Errorf("token format error : %v", err)
|
|
ret = RetCodeNotAuthorized
|
|
ret = RetCodeNotAuthorized
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
err = c.ValidateToken(token)
|
|
err = c.ValidateToken(token)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warn("validate token error : %v", err)
|
|
|
|
|
|
+ server.Log.Errorf("validate token error : %v", err)
|
|
ret = RetCodeNotAuthorized
|
|
ret = RetCodeNotAuthorized
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
if ret != RetCodeAccepted {
|
|
if ret != RetCodeAccepted {
|
|
- server.Log.Warn("invalid CON: %d", ret)
|
|
|
|
|
|
+ server.Log.Errorf("invalid CON: %d", ret)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -218,7 +218,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
|
|
|
|
err = c.Mgr.Provider.OnDeviceOnline(args)
|
|
err = c.Mgr.Provider.OnDeviceOnline(args)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warn("device online error : %v", err)
|
|
|
|
|
|
+ server.Log.Errorf("device online error : %v", err)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -240,7 +240,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
|
|
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warnf("%s, heartbeat set error %s, close now...", host, err)
|
|
|
|
|
|
+ server.Log.Errorf("%s, heartbeat set error %s, close now...", host, err)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -250,7 +250,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
c.confirmPublish(msg.MessageID)
|
|
c.confirmPublish(msg.MessageID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warnf("%s, heartbeat set error %s, close now...", host, err)
|
|
|
|
|
|
+ server.Log.Errorf("%s, heartbeat set error %s, close now...", host, err)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -270,7 +270,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
c.confirmPublish(msg.MessageID)
|
|
c.confirmPublish(msg.MessageID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warnf("%s, heartbeat set error %s, close now...", host, err)
|
|
|
|
|
|
+ server.Log.Errorf("%s, heartbeat set error %s, close now...", host, err)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -280,7 +280,7 @@ func (c *Connection) RcvMsgFromClient() {
|
|
pingrsp := &PingResp{}
|
|
pingrsp := &PingResp{}
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
err := c.Mgr.Provider.OnDeviceHeartBeat(c.DeviceID)
|
|
if err != nil {
|
|
if err != nil {
|
|
- server.Log.Warnf("%s, heartbeat set error %s, close now...", host, err)
|
|
|
|
|
|
+ server.Log.Errorf("%s, heartbeat set error %s, close now...", host, err)
|
|
c.Close()
|
|
c.Close()
|
|
return
|
|
return
|
|
}
|
|
}
|