Merge remote-tracking branch 'origin/bugfix' into bugfix

6 years ago · 48ba1993e0
parent 1a0ff422fe 5de6563ab2
commit 48ba1993e0
1 changed files with 3 additions and 0 deletions
--- a/apps/terminal/api/session.py
+++ b/apps/terminal/api/session.py
@ -39,6 +39,9 @@ class SessionViewSet(BulkModelViewSet):
            terminal = get_object_or_404(Terminal, id=terminal_id)
            queryset = queryset.filter(terminal=terminal)
            return queryset
+        # 解决guacamole更新session时并发导致幽灵会话的问题
+        if self.request.method in ('PATCH', ):
+            queryset = queryset.select_for_update()
        return queryset

    def perform_create(self, serializer):