external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7 from com6056/expire-email-rtp-digest

Browse source 
only send 1 email for rtp expiration notices
This commit is contained in:
Jordan Rodgers 2018-09-05 19:17:06 -07:00 • committed by GitHub
commit 0710367c98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
proxstar/tasks.py
View file

@ -80,10 +80,10 @@ def process_expiring_vms_task():
db = connect_db() db = connect_db()
starrs = connect_starrs() starrs = connect_starrs()
pools = get_pools(proxmox, db) pools = get_pools(proxmox, db)
expired_vms = []
for pool in pools: for pool in pools:
user = User(pool) user = User(pool)
expiring_vms = [] expiring_vms = []
expired_vms = []
vms = user.vms vms = user.vms
for vm in vms: for vm in vms:
vm = VM(vm['vmid']) vm = VM(vm['vmid'])
@ -103,8 +103,8 @@ def process_expiring_vms_task():
delete_vm_task(vm.id) delete_vm_task(vm.id)
if expiring_vms: if expiring_vms:
send_vm_expire_email(pool, expiring_vms) send_vm_expire_email(pool, expiring_vms)
if expired_vms: if expired_vms:
send_rtp_vm_delete_email(expired_vms) send_rtp_vm_delete_email(expired_vms)
def generate_pool_cache_task(): def generate_pool_cache_task():