gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-09 06:35:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

add /mqtt for EMQX websocket listen endpoint

Browse source
This commit is contained in:
Anish Mukherjee 2023-02-21 09:12:08 +05:30
parent 0005554dde
commit 5279900b7c
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mq/emqx.go
View file

@ -10,8 +10,6 @@ import (
"github.com/gravitl/netmaker/servercfg"
)
const emqxBrokerType = "emqx"
type (
emqxUser struct {
UserID string `json:"user_id"`

4
mq/handlers.go
View file

@ -145,7 +145,7 @@ func UpdateHost(client mqtt.Client, msg mqtt.Message) {
var sendPeerUpdate bool
switch hostUpdate.Action {
case models.UpdateHost:
if servercfg.GetBrokerType() == emqxBrokerType {
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
// create EMQX credentials for host if it doesn't exists
if _, err := logic.GetHost(currentHost.ID.String()); err != nil {
if err := CreateEmqxUser(currentHost.ID.String(), currentHost.HostPass, false); err != nil {
@ -161,7 +161,7 @@ func UpdateHost(client mqtt.Client, msg mqtt.Message) {
return
}
case models.DeleteHost:
if servercfg.GetBrokerType() == emqxBrokerType {
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
// delete EMQX credentials for host
if err := DeleteEmqxUser(currentHost.ID.String()); err != nil {
logger.Log(0, "failed to remove host credentials from EMQX: ", currentHost.ID.String(), err.Error())

2
mq/mq.go
View file

@ -39,7 +39,7 @@ func setMqOptions(user, password string, opts *mqtt.ClientOptions) {
// SetupMQTT creates a connection to broker and return client
func SetupMQTT() {
if servercfg.GetBrokerType() == emqxBrokerType {
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
time.Sleep(10 * time.Second) // wait for the REST endpoint to be ready
// setup authenticator and create admin user
if err := CreateEmqxDefaultAuthenticator(); err != nil {

10
servercfg/serverconf.go
View file

@ -13,6 +13,9 @@ import (
"github.com/gravitl/netmaker/models"
)
// EmqxBrokerType denotes the broker type for EMQX MQTT
const EmqxBrokerType = "emqx"
var (
Version = "dev"
Is_EE = false
@ -249,7 +252,12 @@ func GetMessageQueueEndpoint() (string, bool) {
} else {
host = "ws://" + host
}
return host + ":" + GetMQServerPort(), secure
host += ":" + GetMQServerPort()
// websocket listen endpoint for EMQX broker is ws://host:port/mqtt
if GetBrokerType() == EmqxBrokerType {
host += "/mqtt"
}
return host, secure
}
// GetBrokerType - returns the type of MQ broker