修复在线状态

run.sh

@@ -5,12 +5,12 @@ sudo killall -9 httpaccess registry apiprovider devicemanager controller mqttacc
 # start services
 #$GOPATH/bin/httpaccess -etcd http://localhost:2379 -httphost internal:443 -loglevel debug -usehttps -keyfile $GOPATH/src/github.com/PandoCloud/pando-cloud/pkg/server/testdata/key.pem -cafile $GOPATH/src/github.com/PandoCloud/pando-cloud/pkg/server/testdata/cert.pem &
 $GOPATH/bin/httpaccess -etcd http://127.0.0.1:2379 -httphost internal:8088 -loglevel $LEVEL &
-$GOPATH/bin/registry -etcd http://127.0.0.1:2379 -rpchost internal:20034 -aeskey ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP -dbhost 106.14.63.46 -dbname iot-hub -dbport 3306 -dbuser root -dbpass Lijian405! -loglevel $LEVEL &
+$GOPATH/bin/registry -etcd http://127.0.0.1:2379 -rpchost internal:20034 -aeskey ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP -dbhost 192.168.0.224 -dbname iot-hub -dbport 3306 -dbuser root -dbpass zJv4DwFL6G2MgSvP@ -loglevel $LEVEL &
 $GOPATH/bin/apiprovider -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -httphost internal:8888 &
 $GOPATH/bin/devicemanager -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -rpchost internal:20033 &
-$GOPATH/bin/controller -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -rpchost internal:20032  &
+$GOPATH/bin/controller -etcd http://127.0.0.1:2379 -loglevel debug  -rpchost internal:20032  &
 #$GOPATH/bin/mqttaccess -etcd http://localhost:2379 -loglevel debug  -rpchost localhost:20030 -tcphost internal:1883 -usetls -keyfile $GOPATH/src/github.com/PandoCloud/pando-cloud/pkg/server/testdata/key.pem -cafile $GOPATH/src/github.com/PandoCloud/pando-cloud/pkg/server/testdata/cert.pem &
-$GOPATH/bin/mqttaccess -etcd http://127.0.0.1:2379 -loglevel debug  -rpchost internal:20030 -tcphost internal:1883 &
+$GOPATH/bin/mqttaccess -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -rpchost internal:20030 -tcphost internal:1883 &
 $GOPATH/bin/knowoapi -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -httphost internal:8889 -dbhost 106.14.63.46 -dbname iot-hub -dbport 3306 -dbuser root -dbpass Lijian405! -aeskey ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP &
 $GOPATH/bin/fileaccess -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -rpchost internal:20035 -httphost internal:9000 &
 $GOPATH/bin/coapaccess -etcd http://127.0.0.1:2379 -loglevel $LEVEL  -udphost internal:56883 &

services/devicemanager/manager.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"github.com/garyburd/redigo/redis"
 	"sparrow/pkg/online"
 	"sparrow/pkg/rpcs"
@@ -61,10 +60,6 @@ func (dm *DeviceManager) GetDeviceOnlineStatus(args rpcs.ArgsGetDeviceOnlineStat
 		return err
 	}
 
-	if err == redis.ErrNil {
-		return errors.New("device not online")
-	}
-
 	reply.ClientIP = status.ClientIP
 	reply.AccessRPCHost = status.AccessRPCHost
 	reply.HeartbeatInterval = status.HeartbeatInterval

services/mqttaccess/access.go

@@ -47,19 +47,12 @@ func (a *Access) SetStatus(args rpcs.ArgsSetStatus, reply *rpcs.ReplySetStatus)
 func (a *Access) GetStatus(args rpcs.ArgsGetStatus, reply *rpcs.ReplyGetStatus) error {
 	server.Log.Infof("Access Get Status: %v", args)
 	// first send a get status command
-	//cmdArgs := rpcs.ArgsSendCommand{
-	//	DeviceId:  args.Id,
-	//	SubDevice: 65535,
-	//	No:        commandGetCurrentStatus,
-	//	Priority:  99,
-	//	WaitTime:  0,
-	//}
-	//cmdReply := rpcs.ReplySendCommand{}
-	//err := a.SendCommand(cmdArgs, &cmdReply)
-	//if err != nil {
-	//	return err
-	//}
-	//
+	cmdArgs := rpcs.ArgsSendCommand{
+		DeviceId: args.Id,
+		WaitTime: 0,
+		Cmd:      "report",
+	}
+	cmdReply := rpcs.ReplySendCommand{}
 	//// then wait for status report
 	//StatusChan[args.Id] = make(chan *protocol.Data)
 	//after := time.After(defaultTimeoutSecond * time.Second)
@@ -77,7 +70,7 @@ func (a *Access) GetStatus(args rpcs.ArgsGetStatus, reply *rpcs.ReplyGetStatus)
 	//	reply.Status = data.SubData
 	//	return nil
 	//}
-	return nil
+	return a.SendCommand(cmdArgs, &cmdReply)
 }
 
 func (a *Access) SendCommand(args rpcs.ArgsSendCommand, reply *rpcs.ReplySendCommand) error {