set version pyoidc, clean up js, fix alumni rtp stuff

This commit is contained in:
Jordan Rodgers 2018-09-17 21:34:13 -04:00
parent d0995365dd
commit 820a1c999e
6 changed files with 34 additions and 163 deletions

View file

@ -93,11 +93,10 @@ def process_expiring_vms_task():
expiring_vms.append([vm.id, vm.name, days])
if days <= 0:
expired_vms.append([vm.id, vm.name, days])
if days <= 0:
vm.stop()
elif days == -7:
elif days <= -7:
print(
"Deleting {} ({}) as it has been a week since expiration.".
"Deleting {} ({}) as it has been at least a week since expiration.".
format(vm.name, vm.id))
send_stop_ssh_tunnel(vm.id)
delete_vm_task(vm.id)