Explorar o código

hardcode mq broker endpint

Signed-off-by: Matthew R. Kasun <[email protected]>
Matthew R. Kasun %!s(int64=3) %!d(string=hai) anos
pai
achega
f7d4b2d7af
Modificáronse 3 ficheiros con 3 adicións e 6 borrados
  1. 1 3
      mq/handlers.go
  2. 1 1
      mq/mq.go
  3. 1 2
      netclient/functions/mqpublish.go

+ 1 - 3
mq/handlers.go

@@ -41,14 +41,12 @@ func Ping(client mqtt.Client, msg mqtt.Message) {
 		//	logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error())
 		//	return
 		//}
-		version := []byte{}
-		if err := json.Unmarshal(msg.Payload(), &version); err != nil {
+		if err := json.Unmarshal(msg.Payload(), &node.Version); err != nil {
 			logger.Log(0, "error getting version from payload ", node.ID, err.Error())
 			return
 		}
 
 		node.SetLastCheckIn()
-		node.Version = string(version)
 		if err := logic.UpdateNode(&node, &node); err != nil {
 			logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error())
 			return

+ 1 - 1
mq/mq.go

@@ -21,7 +21,7 @@ var peer_force_send = 0
 // SetupMQTT creates a connection to broker and return client
 func SetupMQTT(publish bool) mqtt.Client {
 	opts := mqtt.NewClientOptions()
-	opts.AddBroker(servercfg.GetMessageQueueEndpoint(false))
+	opts.AddBroker("tcp://127.0.0.1:1883")
 	id := ncutils.MakeRandomString(23)
 	opts.ClientID = id
 	opts.SetAutoReconnect(true)

+ 1 - 2
netclient/functions/mqpublish.go

@@ -136,9 +136,8 @@ func publish(nodeCfg *config.ClientConfig, dest string, msg []byte, qos byte) er
 	//if err != nil {
 	//return err
 	//}
-	encrypted := "This is a test"
 	logger.Log(0, "calling Publish")
-	if token := client.Publish(dest, qos, false, encrypted); token.Wait() && token.Error() != nil {
+	if token := client.Publish(dest, qos, false, msg); token.Wait() && token.Error() != nil {
 		return token.Error()
 	}
 	return nil