diff options
| author | Till <2353100+S7evinK@users.noreply.github.com> | 2023-05-30 10:02:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-30 10:02:53 +0200 |
| commit | f956a8c1d9172f6bbfb9f7515feacd477a0e35f5 (patch) | |
| tree | 18a02759cc674eb79b3b1b1168abd3d6d5a65e54 /roomserver/internal | |
| parent | 11b557097c6745309c09b58f681080d3fcc4f9f5 (diff) | |
Docs restructure (#2953)
Needs to be merged into `gh-pages` later on.
Diffstat (limited to 'roomserver/internal')
| -rw-r--r-- | roomserver/internal/perform/perform_admin.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go index 17296feb..8d21b782 100644 --- a/roomserver/internal/perform/perform_admin.go +++ b/roomserver/internal/perform/perform_admin.go @@ -136,7 +136,7 @@ func (r *Admin) PerformAdminEvacuateRoom( inputReq := &api.InputRoomEventsRequest{ InputRoomEvents: inputEvents, - Asynchronous: true, + Asynchronous: false, } inputRes := &api.InputRoomEventsResponse{} r.Inputer.InputRoomEvents(ctx, inputReq, inputRes) @@ -200,18 +200,24 @@ func (r *Admin) PerformAdminPurgeRoom( } // Evacuate the room before purging it from the database - if _, err := r.PerformAdminEvacuateRoom(ctx, roomID); err != nil { + evacAffected, err := r.PerformAdminEvacuateRoom(ctx, roomID) + if err != nil { logrus.WithField("room_id", roomID).WithError(err).Warn("Failed to evacuate room before purging") return err } + logrus.WithFields(logrus.Fields{ + "room_id": roomID, + "evacuated_users": len(evacAffected), + }).Warn("Evacuated room, purging room from roomserver now") + logrus.WithField("room_id", roomID).Warn("Purging room from roomserver") if err := r.DB.PurgeRoom(ctx, roomID); err != nil { logrus.WithField("room_id", roomID).WithError(err).Warn("Failed to purge room from roomserver") return err } - logrus.WithField("room_id", roomID).Warn("Room purged from roomserver") + logrus.WithField("room_id", roomID).Warn("Room purged from roomserver, informing other components") return r.Inputer.OutputProducer.ProduceRoomEvents(roomID, []api.OutputEvent{ { |