Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sendSystemMessageOnWS - send message on socket to all brokers #1171

Merged
merged 3 commits into from
Jul 26, 2023
Merged

sendSystemMessageOnWS - send message on socket to all brokers #1171

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71233d6
sendSystemMessageOnWS - send message on socket to all brokers
shohamroditimemphis Jul 26, 2023
db045be
fix
shohamroditimemphis Jul 26, 2023
6c78d47
fix
shohamroditimemphis Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions server/memphis_handlers_ws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,24 +411,34 @@ func memphisWSGetStationOverviewData(s *Server, h *Handlers, stationName string,
}

func (s *Server) sendSystemMessageOnWS(user models.User, systemMessage SystemMessage) error {
subscriptions := serv.memphis.ws.subscriptions
if f, ok := subscriptions.Load(memphisWS_TemplSubj_Publish); ok {
if _, ok := f.tenants[user.TenantName]; ok {
replySubj := fmt.Sprintf("%s.%s.%s", memphisWS_TemplSubj_Publish, memphisWS_Subj_GetSystemMessages, serv.opts.ServerName)
v, err := serv.Varz(nil)
if err != nil {
serv.Errorf("[tenant: %v][user: %v]sendSystemMessageOnWS: %v", user.TenantName, user.Username, err.Error())
return err
}
var serverNames []string
if len(v.Cluster.URLs) == 0 {
serverNames = append(serverNames, "memphis-0")
}
for i := range v.Cluster.URLs {
serverNames = append(serverNames, "memphis-"+strconv.Itoa(i))
}

acc, err := serv.lookupAccount(user.TenantName)
if err != nil {
err = fmt.Errorf("sendSystemMessageOnWS at lookupAccount: %v", err.Error())
return err
}
for _, serverName := range serverNames {
replySubj := fmt.Sprintf("%s.%s.%s", memphisWS_TemplSubj_Publish, memphisWS_Subj_GetSystemMessages, serverName)

updateRaw, err := json.Marshal(systemMessage)
if err != nil {
err = fmt.Errorf("sendSystemMessageOnWS at json.Marshal: %v", err.Error())
return err
}
serv.sendInternalAccountMsgWithEcho(acc, replySubj, updateRaw)
acc, err := serv.lookupAccount(user.TenantName)
shohamroditimemphis marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
err = fmt.Errorf("sendSystemMessageOnWS at lookupAccount: %v", err.Error())
return err
}

updateRaw, err := json.Marshal(systemMessage)
if err != nil {
err = fmt.Errorf("sendSystemMessageOnWS at json.Marshal: %v", err.Error())
return err
}
serv.sendInternalAccountMsgWithEcho(acc, replySubj, updateRaw)
}

return nil
Expand Down