Transactions
diff --git a/manage.py b/manage.py
index 39189f5..2e71ca6 100644
--- a/manage.py
+++ b/manage.py
@@ -66,10 +66,11 @@ def autodisable():
#print('Found {}.'.format(str(deploy.machine_alias)))
lastcharge = deploy.date_last_charge
expiry = lastcharge + relativedelta(lastcharge, months=+(deploy.period))
- if today > expiry:
+ if today >= expiry:
email_content = '[!] Deployment "' + deploy.machine_alias + '" is past expiration date and will be marked INACTIVE. Last charged: ' + lastcharge.strftime('%c') + ' expiry date: ' + expiry.strftime('%c')
print(str(email_content))
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=deploy.owner, content=str(email_content))
+ #send_email(str(deploy.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
deploy.warning = False
deploy.enabled = False
deploy.daysleft = 0
@@ -80,10 +81,11 @@ def autodisable():
for service in services_ena:
lastcharge = service.date_last_charge
expiry = lastcharge + relativedelta(lastcharge, months=+(service.period))
- if today > expiry:
+ if today >= expiry:
email_content = '[!] Service "' + service.description + '" is past expiration date and will be marked INACTIVE. Last charged: ' + lastcharge.strftime('%c') + ' expiry date: ' + expiry.strftime('%c')
print(str(email_content))
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=service.owner, content=str(email_content))
+ #send_email(str(deploy.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
service.warning = False
service.enabled = False
service.daysleft = 0
@@ -93,10 +95,11 @@ def autodisable():
domains_ena = Domain.query.filter_by(deleted=False).filter_by(enabled=True).all()
for domain in domains_ena:
expiry = domain.date_expire
- if today > expiry:
+ if today >= expiry:
email_content = '[!] Domain "' + domain.fqdn + '" is past expiration date and will be marked as INACTIVE. Last charged: ' + lastcharge.strftime('%c') + ' expiry date: ' + expiry.strftime('%c')
print(str(email_content))
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=domain.owner, content=str(email_content))
+ #send_email(str(deploy.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
domain.warning = False
domain.enabled = False
domain.daysleft = 0
@@ -121,10 +124,12 @@ def autowarn():
email_content = 'Deployment "' + deploy.machine_alias + '" is ' + str(daysleft.days) + ' days until expiration. Last charged: ' + lastcharge.strftime('%c') + ' expiry date: ' + expiry.strftime('%c')
if daysleft.days == warndays or (daysleft.days / 2) == warndays:
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=deploy.owner, content=str(email_content))
+ #send_email(str(deploy.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
+ deploy.warning = True
if daysleft.days < warndays:
print(str(email_content))
deploy.warning = True
- db.session.commit()
+ db.session.commit()
print('\n[{}] Scan for enabled services that will expire soon and enable the warning flag:'.format(today.replace(microsecond=0)))
services_ena = Service.query.filter_by(deleted=False).filter_by(enabled=True).all()
@@ -138,10 +143,12 @@ def autowarn():
email_content = 'Service "' + service.description + '" is ' + str(daysleft.days) + ' days until expiration. Last charged: ' + lastcharge.strftime('%c') + ' expiry date: ' + expiry.strftime('%c')
if daysleft.days == warndays or (daysleft.days / 2) == warndays:
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=service.owner, content=str(email_content))
+ send_email(str(service.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
+ service.warning = True
if daysleft.days < warndays:
print(str(email_content))
service.warning = True
- db.session.commit()
+ db.session.commit()
domains_ena = Domain.query.filter_by(deleted=False).filter_by(enabled=True).all()
for domain in domains_ena:
@@ -153,10 +160,12 @@ def autowarn():
email_content = 'Domain "' + domain.fqdn + '" is ' + str(daysleft.days)+ ' days until expiration. Expiry date: ' + expiry.strftime('%c')
if daysleft.days == warndays or (daysleft.days / 2) == warndays:
send_email(app.config['MAIL_USERNAME'], str(email_content), 'email/adm_logger', user=domain.owner, content=str(email_content))
+ send_email(str(domain.owner.email), str(email_content), 'email/client_logger', content=str(email_content))
+ domain.warning = True
if daysleft.days < warndays:
print(str(email_content))
domain.warning = True
- db.session.commit()
+ db.session.commit()
@manager.command
def runserver():