From 30d2004912d5ee0a9c771208691c8a165ea37cbf Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 13 Sep 2023 09:49:44 +0200 Subject: [PATCH] added remove log manager server connection --- socketclients/socketclients.go | 8 ++++++-- socketserver/hub.go | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/socketclients/socketclients.go b/socketclients/socketclients.go index 265c710..d90455e 100644 --- a/socketclients/socketclients.go +++ b/socketclients/socketclients.go @@ -1082,7 +1082,7 @@ func HandleCheckWhichCategoriesAreAvailable() { ) } -func AddLogManagerServerConnection(displayName string, address string) { +func AddLogManagerServerConnection(userId string, displayName string, address string) { newConnection := structs.LogManagerServerConnection{ Id: uuid.New().String(), DisplayName: displayName, @@ -1098,9 +1098,11 @@ func AddLogManagerServerConnection(displayName string, address string) { Cmd: utils.SentCmdAdminAreaManageLogManagerServerConnectionAdded, Body: newConnection, }) + + logger.AddSystemLog("User %s has added log manager server connection with id %s, display name %s and address %s", userId, newConnection.Id, displayName, address) } -func DeleteLogManagerServerConnection(id string) { +func DeleteLogManagerServerConnection(userId string, id string) { database.DB.Where("id = ?", id).Delete(&structs.LogManagerServerConnection{}) BroadcastMessageToTopics( @@ -1109,4 +1111,6 @@ func DeleteLogManagerServerConnection(id string) { Cmd: utils.SentCmdAdminAreaManageLogManagerServerConnectionRemoved, Body: id, }) + + logger.AddSystemLog("User %s has removed log manager server connection with id %s", userId, id) } \ No newline at end of file diff --git a/socketserver/hub.go b/socketserver/hub.go index 05f1d67..5e311e6 100644 --- a/socketserver/hub.go +++ b/socketserver/hub.go @@ -339,14 +339,14 @@ func RunHub() { socketclients.SendErrorMessageNoPermissions(data.Conn.Locals("sessionId").(string)) } - socketclients.AddLogManagerServerConnection(receivedMessage.Body["DisplayName"].(string), receivedMessage.Body["Address"].(string)) + socketclients.AddLogManagerServerConnection(data.Conn.Locals("userId").(string), receivedMessage.Body["DisplayName"].(string), receivedMessage.Body["Address"].(string)) break case utils.ReceivedCmdAdminAreaManageDeleteLogManagerServerConnection: if !socketclients.HasPermission(data.Conn.Locals("userId").(string), utils.PermissionAdminAreaManageRemoveLogManagerServerConnection) { socketclients.SendErrorMessageNoPermissions(data.Conn.Locals("sessionId").(string)) } - socketclients.DeleteLogManagerServerConnection(receivedMessage.Body["Id"].(string)) + socketclients.DeleteLogManagerServerConnection(data.Conn.Locals("userId").(string), receivedMessage.Body["Id"].(string)) break default: