This commit is contained in:
j 2019-02-01 14:56:33 +05:30
parent fbcbc2ab7b
commit ac84e82a52

View file

@ -504,7 +504,7 @@ class Nodes(Thread):
while not state.shutdown: while not state.shutdown:
args = self._q.get() args = self._q.get()
if args: if args:
logger.debug('processing nodes queue: next: %s, %s entries in queue', args[0], self._q.qsize()) logger.debug('processing nodes queue: next: "%s", %s entries in queue', args[0], self._q.qsize())
if args[0] == 'add': if args[0] == 'add':
self._add(*args[1:]) self._add(*args[1:])
elif args[0] == 'pull': elif args[0] == 'pull':
@ -514,7 +514,7 @@ class Nodes(Thread):
def queue(self, *args): def queue(self, *args):
if args: if args:
logger.debug('add %s to queue, queue currently has %s entries', args[0], self._q.qsize()) logger.debug('queue "%s", %s entries in queue', args[0], self._q.qsize())
self._q.put(list(args)) self._q.put(list(args))
def is_online(self, id): def is_online(self, id):
@ -568,7 +568,7 @@ class Nodes(Thread):
users = [] users = []
with db.session(): with db.session():
from user.models import User from user.models import User
for u in User.query.filter(User.id!=settings.USER_ID).filter_by(peered=True).all(): for u in User.query.filter(User.id != settings.USER_ID).filter_by(peered=True).all():
users.append(u.json(['id', 'index', 'name'])) users.append(u.json(['id', 'index', 'name']))
users.sort(key=user_sort_key) users.sort(key=user_sort_key)
for u in users: for u in users: