shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-22 22:03:54 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.0' into v2.1

Browse Source
This commit is contained in:
Adolfo Gómez García 2016-10-14 10:59:12 +02:00
commit 00798e5927
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/core/managers/UserServiceManager.py
View File

@ -51,7 +51,7 @@ import requests
import json import json
import logging import logging
__updated__ = '2016-10-13' __updated__ = '2016-10-14'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -392,7 +392,7 @@ class UserServiceManager(object):
url += '/uuid' url += '/uuid'
try: try:
r = requests.get(url, verify=False, timeout=2) r = requests.get(url, verify=False, timeout=5)
uuid = json.loads(r.content) uuid = json.loads(r.content)
if uuid != uService.uuid: if uuid != uService.uuid:
logger.info('The requested machine has uuid {} and the expected was {}'.format(uuid, uService.uuid)) logger.info('The requested machine has uuid {} and the expected was {}'.format(uuid, uService.uuid))