From 33e672c32be86297462a42e37c3469e35ab8b957 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 4 Jul 2016 15:36:50 +0530 Subject: [PATCH] log url timeouts --- oml/nodes.py | 4 ++++ oml/user/api.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/oml/nodes.py b/oml/nodes.py index 8fc6646..3c14323 100644 --- a/oml/nodes.py +++ b/oml/nodes.py @@ -142,6 +142,10 @@ class Node(Thread): logger.debug('urllib2.URLError %s', e) self.online = False return None + except socket.timeout: + logger.debug('timeout %s', url) + self.online = False + return None except: logger.debug('unknown url error', exc_info=True) self.online = False diff --git a/oml/user/api.py b/oml/user/api.py index d306b50..f70737d 100644 --- a/oml/user/api.py +++ b/oml/user/api.py @@ -127,7 +127,7 @@ def getUsers(data): users = [] ids = set() local = set() - for u in models.User.query.filter(models.User.id!=settings.USER_ID).all(): + for u in models.User.query.filter(models.User.id != settings.USER_ID).all(): users.append(u.json()) ids.add(u.id) if state.nodes: