0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

better logging

Browse source
This commit is contained in:
j 2016-04-05 01:28:55 +02:00
commit 6eff308468
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
oml/nodes.py
View file

@ -71,13 +71,12 @@ class Node(Thread):
@property
def url(self):
url = None
if self.local:
if ':' in self.local:
url = 'https://[%s]:%s' % (self.local, self.port)
else:
url = 'https://%s:%s' % (self.local, self.port)
elif len(self.user_id) == 16:
else:
url = 'https://%s.onion:9851' % self.user_id
return url
@ -110,14 +109,12 @@ class Node(Thread):
return None
def request(self, action, *args):
logger.debug('request[%s] %s%s', self.user_id, action, args)
self.resolve()
url = self.url
if not url:
logger.debug('unable to find host %s', self.user_id)
self.online = False
return None
#logger.debug('url=%s', url)
if self.local:
logger.debug('request:%s(%s:%s): %s%s', self.user_id, self.local, self.port, action, list(args))
else:
logger.debug('request:%s: %s%s', self.user_id, action, list(args))
content = json.dumps([action, args]).encode()
headers = {
'User-Agent': settings.USER_AGENT,