github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9871 from jumpserver/pr@dev@fix_su_from_accounts 

fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug
pull/9883/head
老广 2023-03-08 14:06:59 +08:00 committed by GitHub
parent 1cbfd48e11 8833b19d79
commit 21352a2ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/api/account/account.py
View File

@ -43,7 +43,7 @@ class AccountViewSet(OrgBulkModelViewSet):
asset = get_object_or_404(Asset, pk=asset_id) asset = get_object_or_404(Asset, pk=asset_id)
accounts = asset.accounts.all() accounts = asset.accounts.all()
else: else:
accounts = [] accounts = Account.objects.none()
accounts = self.filter_queryset(accounts) accounts = self.filter_queryset(accounts)
serializer = serializers.AccountSerializer(accounts, many=True) serializer = serializers.AccountSerializer(accounts, many=True)
return Response(data=serializer.data) return Response(data=serializer.data)

2
apps/common/utils/connection.py
View File

@ -108,7 +108,7 @@ class Subscription:
try: try:
self.sub.close() self.sub.close()
except Exception as e: except Exception as e:
logger.error('Unsubscribe msg error: {}'.format(e)) logger.debug('Unsubscribe msg error: {}'.format(e))
def retry(self, _next, error, complete): def retry(self, _next, error, complete):
logger.info('Retry subscribe channel: {}'.format(self.ch)) logger.info('Retry subscribe channel: {}'.format(self.ch))