mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-15 08:32:48 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3153458fce | ||
|
|
4b981fd93c |
@@ -3,6 +3,7 @@ from collections import defaultdict
|
|||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.utils.functional import lazy
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
|
|
||||||
from common.db.models import ChoicesMixin
|
from common.db.models import ChoicesMixin
|
||||||
@@ -29,15 +30,15 @@ class AllTypes(ChoicesMixin):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def choices(cls):
|
def choices(cls):
|
||||||
|
return lazy(cls.get_choices, list)()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_choices(cls):
|
||||||
choices = []
|
choices = []
|
||||||
for tp in cls.includes:
|
for tp in cls.includes:
|
||||||
choices.extend(tp.get_choices())
|
choices.extend(tp.get_choices())
|
||||||
return choices
|
return choices
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_choices(cls):
|
|
||||||
return cls.choices()
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def filter_choices(cls, category):
|
def filter_choices(cls, category):
|
||||||
choices = dict(cls.category_types()).get(category, cls).get_choices()
|
choices = dict(cls.category_types()).get(category, cls).get_choices()
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class Subscription:
|
|||||||
self.ch = pb.ch
|
self.ch = pb.ch
|
||||||
self.sub = sub
|
self.sub = sub
|
||||||
self.unsubscribed = False
|
self.unsubscribed = False
|
||||||
logger.info("Subscribed to channel: ", sub)
|
logger.info(f"Subscribed to channel: {sub}")
|
||||||
|
|
||||||
def _handle_msg(self, _next, error, complete):
|
def _handle_msg(self, _next, error, complete):
|
||||||
"""
|
"""
|
||||||
@@ -106,11 +106,11 @@ class Subscription:
|
|||||||
|
|
||||||
def unsubscribe(self):
|
def unsubscribe(self):
|
||||||
self.unsubscribed = True
|
self.unsubscribed = True
|
||||||
logger.info("Unsubscribed from channel: ", self.sub)
|
logger.info(f"Unsubscribed from channel: {self.sub}")
|
||||||
try:
|
try:
|
||||||
self.sub.close()
|
self.sub.close()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning('Unsubscribe msg error: {}'.format(e))
|
logger.warning(f'Unsubscribe msg error: {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))
|
||||||
|
|||||||
Reference in New Issue
Block a user