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

Fixed "keep on new publication"

Browse Source
This commit is contained in:
Adolfo Gómez García
2018-07-02 13:28:28 +02:00
parent 6c2a7ff6e6
commit f333f2f71f
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/uds/osmanagers/LinuxOsManager/LinuxOsManager.py
View File

@ -92,6 +92,16 @@ class LinuxOsManager(osmanagers.OSManager):
def release(self, service):
pass
def isRemovableOnLogout(self, userService):
'''
Says if a machine is removable on logout
'''
if userService.in_use == False:
if (self._onLogout == 'remove') or (not userService.isValidPublication() and self._onLogout == 'keep'):
return True
return False
def getName(self, service):
'''
gets name from deployed
@ -165,8 +175,7 @@ class LinuxOsManager(osmanagers.OSManager):
ret = "{0}\t{1}\t{2}".format(ip, hostname, 0 if deadLine is None else deadLine)
elif msg == "logout":
self.loggedOut(userService, data, False)
if userService.in_use == False and self._onLogout == 'remove':
doRemove = True
doRemove = self.isRemovableOnLogout(userService)
elif msg == "ip":
# This ocurss on main loop inside machine, so userService is usable
state = State.USABLE
@ -195,11 +204,11 @@ class LinuxOsManager(osmanagers.OSManager):
This will be invoked for every assigned and unused user service that has been in this state at least 1/2 of Globalconfig.CHECK_UNUSED_TIME
This function can update userService values. Normal operation will be remove machines if this state is not valid
'''
if self._onLogout == 'remove':
if self.isRemovableOnLogout(userService):
userService.remove()
def isPersistent(self):
return not self._onLogout == 'keep-always'
return self._onLogout == 'keep-always'
def checkState(self, service):
logger.debug('Checking state for service {0}'.format(service))

17
server/src/uds/osmanagers/WindowsOsManager/WindowsOsManager.py
View File

@ -93,6 +93,16 @@ class WindowsOsManager(osmanagers.OSManager):
self.__setProcessUnusedMachines()
def isRemovableOnLogout(self, userService):
'''
Says if a machine is removable on logout
'''
if userService.in_use == False:
if (self._onLogout == 'remove') or (not userService.isValidPublication() and self._onLogout == 'keep'):
return True
return False
def release(self, service):
pass
@ -179,8 +189,7 @@ class WindowsOsManager(osmanagers.OSManager):
ret = "{0}\t{1}".format(ip, hostname)
elif msg == "logoff" or msg == 'logout':
self.loggedOut(userService, data, False)
if userService.in_use == False and self._onLogout == 'remove':
doRemove = True
doRemove = self.isRemovableOnLogout(userService)
elif msg == "ip":
# This ocurss on main loop inside machine, so userService is usable
state = State.USABLE
@ -213,11 +222,11 @@ class WindowsOsManager(osmanagers.OSManager):
This will be invoked for every assigned and unused user service that has been in this state at least 1/2 of Globalconfig.CHECK_UNUSED_TIME
This function can update userService values. Normal operation will be remove machines if this state is not valid
'''
if self._onLogout == 'remove':
if self.isRemovableOnLogout(userService):
userService.remove()
def isPersistent(self):
return not self._onLogout == 'keep-always'
return self._onLogout == 'keep-always'
def checkState(self, service):
logger.debug('Checking state for service {0}'.format(service))