fix device conditionally offline bug.

Author: ruizeng

pkg/mqtt/connection.go

@@ -190,12 +190,6 @@ func (c *Connection) RcvMsgFromClient() {
 				AccessRPCHost:     server.GetRPCHost(),
 				HeartbeatInterval: uint32(c.KeepAlive),
 			}
-			err = c.Mgr.Provider.OnDeviceOnline(args)
-			if err != nil {
-				server.Log.Warn("device online error : %v", err)
-				c.Close()
-				return
-			}
 
 			c.Mgr.AddConn(c.DeviceId, c)
 			connack := &ConnAck{
@@ -204,7 +198,15 @@ func (c *Connection) RcvMsgFromClient() {
 
 			c.Submit(connack)
 			c.KeepAlive = msg.KeepAliveTimer
-			server.Log.Infof("%s, connected to server now", host)
+
+			err = c.Mgr.Provider.OnDeviceOnline(args)
+			if err != nil {
+				server.Log.Warn("device online error : %v", err)
+				c.Close()
+				return
+			}
+
+			server.Log.Infof("device %d, connected to server now, host: %s", c.DeviceId, host)
 
 		case *Publish:
 			server.Log.Infof("%s, publish topic: %s", host, msg.TopicName)

pkg/mqtt/manager.go

@@ -93,6 +93,7 @@ func (m *Manager) CleanWorker() {
 			if uint16(curTime-con.LastHbTime) > uint16(3*con.KeepAlive/2) {
 				server.Log.Infof("connection %v inactive , removing", con)
 				con.Close()
+				delete(m.IdToConn, con.DeviceId)
 			}
 		}
 

pkg/online/online.go

@@ -80,9 +80,6 @@ func (mgr *Manager) SetHeartbeat(id uint64) error {
 		return err
 	}
 
-	if err != nil {
-		return nil
-	}
 	if status == nil {
 		return errors.New("device offline.")
 	}