vmware.py (salt-3002.1) | : | vmware.py (salt-3002.2) | ||
---|---|---|---|---|
skipping to change at line 429 | skipping to change at line 429 | |||
stub = GetStub() | stub = GetStub() | |||
if salt.utils.platform.is_proxy() or ( | if salt.utils.platform.is_proxy() or ( | |||
hasattr(stub, "host") and stub.host != ":".join([host, str(port)]) | hasattr(stub, "host") and stub.host != ":".join([host, str(port)]) | |||
): | ): | |||
# Proxies will fork and mess up the cached service instance. | # Proxies will fork and mess up the cached service instance. | |||
# If this is a proxy or we are connecting to a different host | # If this is a proxy or we are connecting to a different host | |||
# invalidate the service instance to avoid a potential memory leak | # invalidate the service instance to avoid a potential memory leak | |||
# and reconnect | # and reconnect | |||
Disconnect(service_instance) | Disconnect(service_instance) | |||
service_instance = None | service_instance = None | |||
else: | ||||
return service_instance | ||||
if not service_instance: | if not service_instance: | |||
service_instance = _get_service_instance( | service_instance = _get_service_instance( | |||
host, username, password, protocol, port, mechanism, principal, doma in | host, username, password, protocol, port, mechanism, principal, doma in | |||
) | ) | |||
# Test if data can actually be retrieved or connection has gone stale | # Test if data can actually be retrieved or connection has gone stale | |||
log.trace("Checking connection is still authenticated") | log.trace("Checking connection is still authenticated") | |||
try: | try: | |||
service_instance.CurrentTime() | service_instance.CurrentTime() | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 0 lines changed or added |