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

Merge remote-tracking branch 'origin/v1.7'

Browse Source
This commit is contained in:
Adolfo Gómez García 2015-05-21 07:23:39 +02:00
commit 5dc2c16cbe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actors/src/udsactor/service.py
View File

@ -177,7 +177,7 @@ class CommonService(object):
except REST.UserServiceNotFoundError:
logger.error('The host has lost the sync state with broker! (host uuid changed?)')
return False
except Exception:
except Exception as e:
if counter % 60 == 0:
logger.warn('Too many retries in progress, though still trying (last error: {})'.format(exceptionToMessage(e)))
counter += 1

4
server/src/uds/osmanagers/LinuxOsManager/LinuxRandomPassOsManager.py
View File

@ -85,10 +85,10 @@ class LinuxRandomPassManager(LinuxOsManager):
return randomPass
def infoVal(self, service):
return 'rename:{0}\t{1}\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service))
return 'rename:{0}\t{1}\t\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service))
def infoValue(self, service):
return 'rename\r{0}\t{1}\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service))
return 'rename\r{0}\t{1}\t\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service))
def marshal(self):
base = super(LinuxRandomPassManager, self).marshal()