shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-23 17:34:17 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.1'

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-04-06 19:56:29 +02:00
commit f2523fa8f2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/uds/core/workers/HangedCleaner.py
View File

@ -55,7 +55,7 @@ class HangedCleaner(Job):
def run(self):
since_state = getSqlDatetime() - timedelta(seconds=GlobalConfig.MAX_INITIALIZING_TIME.getInt())
# Filter for locating machine not ready
flt = Q(state_date__lt=since_state, state=State.PREPARING) | Q(state_date__lt=since_state, state=State.USABLE, os_state=State.PREPARING)
flt = Q(state_date__lt=since_state, state=State.PREPARING) | Q(state_date__lt=since_state, state=State.USABLE, os_state=State.PREPARING) | Q(state_date__lt=since_state, state=State.REMOVING)
for ds in DeployedService.objects.exclude(osmanager=None, state__in=State.VALID_STATES, service__provider__maintenance_mode=True):
logger.debug('Searching for hanged services for {0}'.format(ds))
@ -63,4 +63,7 @@ class HangedCleaner(Job):
logger.debug('Found hanged service {0}'.format(us))
log.doLog(us, log.ERROR, 'User Service seems to be hanged. Removing it.', log.INTERNAL)
log.doLog(ds, log.ERROR, 'Removing user service {0} because it seems to be hanged'.format(us.friendly_name))
us.removeOrCancel()
if us.state in (State.REMOVING,):
us.setState(State.ERROR)
else:
us.removeOrCancel()

1
server/src/uds/dispatchers/guacamole/views.py
View File

@ -60,6 +60,7 @@ def guacamole(request, tunnelId):
response = dict2resp(val)
except Exception:
logger.error('Invalid guacamole ticket (F5 on client?): {}'.format(tunnelId))
return HttpResponse(ERROR, content_type=CONTENT_TYPE)
return HttpResponse(response, content_type=CONTENT_TYPE)