x/opencafe
Code Issues Proposed changes

Merge "Added error handling for WinRM connections"

Browse Source
This commit is contained in:
Jenkins
2014-04-25 04:13:52 +00:00
committed by Gerrit Code Review
parent f7e4f0084a ea8317083b
commit b2e42d7946
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cafe/engine/clients/winrm_client.py
View File

@@ -18,6 +18,7 @@ import time
# WinRM package is not currently pip installable, so will not expect # WinRM package is not currently pip installable, so will not expect
# it be installed unless explicitly needed # it be installed unless explicitly needed
try: try:
from winrm.exceptions import WinRMTransportError
from winrm.protocol import Protocol from winrm.protocol import Protocol
except: except:
raise Exception("Dependency 'winrm' missing.") raise Exception("Dependency 'winrm' missing.")
@@ -158,7 +159,10 @@ class WinRMClient(BaseWinRMClient):
'{retries} to {host}.'.format( '{retries} to {host}.'.format(
iteration=iteration, retries=retries, iteration=iteration, retries=retries,
host=self.host)) host=self.host))
self.connect(username=self.username, password=self.password) try:
self.connect(username=self.username, password=self.password)
except WinRMTransportError as exception:
self._log.error(exception.message)
if self.is_connected(): if self.is_connected():
return True return True
time.sleep(cooldown) time.sleep(cooldown)