log url timeouts

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

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: