burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed ovirt..

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-03-29 13:02:17 +02:00
parent 92cf8c36bd
commit e81a8fdc5f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/uds/services/OVirt/client/oVirtClient3.py
View File

@ -11,7 +11,7 @@ import threading
import logging import logging
import re import re
__updated__ = '2017-03-17' __updated__ = '2017-03-29'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -693,6 +693,9 @@ class Client(object):
} }
} }
except Exception:
return None
finally: finally:
lock.release() lock.release()

5
server/src/uds/services/OVirt/client/oVirtClient4.py
View File

@ -17,7 +17,7 @@ import threading
import logging import logging
import six import six
__updated__ = '2017-03-22' __updated__ = '2017-03-29'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -718,6 +718,9 @@ class Client(object):
} }
} }
except Exception:
return None
finally: finally:
lock.release() lock.release()

4
server/src/uds/transports/SPICE/BaseSPICETransport.py
View File

@ -44,7 +44,7 @@ from uds.services.OVirt.OVirtProvider import Provider as oVirtProvider
import logging import logging
import os import os
__updated__ = '2017-03-28' __updated__ = '2017-03-29'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -119,7 +119,7 @@ class BaseSpiceTransport(Transport):
logger.info('SPICE didn\'t find has any port: {}'.format(con)) logger.info('SPICE didn\'t find has any port: {}'.format(con))
return False return False
if connection.testServer(ip, port_to_test) is True: if connection.testServer(con['address'], port_to_test) is True:
self.cache.put(ip, 'Y', READY_CACHE_TIMEOUT) self.cache.put(ip, 'Y', READY_CACHE_TIMEOUT)
return ready == 'Y' return ready == 'Y'