feature/improved-warning-mails: improve text of warning/notification mail for...

feature/improved-warning-mails: improve text of warning/notification mail for delayed expiring of rules (e.g., in case of NETCONF connection errors)

flowspec/tasks.py

@@ -321,15 +321,20 @@ def notify_expired():
                     mail_body = render_to_string("rule_action.txt",
                                              {"route": route, 'expiration_days':expiration_days, 'action':'expires', 'url':admin_url})
                     days_num = ' days'
+                    expiration_days_text0 = "expires "
                     expiration_days_text = "%s %s" %('in',expiration_days)
                     if expiration_days == 0:
                         days_num = ' today'
                         expiration_days_text = ''
-                    if expiration_days == 1:
+                    elif expiration_days == 1:
                         days_num = ' day'
-                    logger.info('Route %s expires %s%s. Notifying %s (%s)' %(route.name, expiration_days_text, days_num, route.applier.username, route.applier.email))
-                    send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s expires %s%s" %
-                              (route.name,expiration_days_text, days_num),
+                    elif expiration_days < 0:
+                        expiration_days_text0 = "should already have expired "
+                        expiration_days_text = "%s days ago" %(-expiration_days)
+                        days_num = ''
+                    logger.info('Route %s %s %s%s. Notifying %s (%s)' %(route.name, expiration_days_text0, expiration_days_text, days_num, route.applier.username, route.applier.email))
+                    send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s %s %s%s" %
+                              (route.name, expiration_days_text0, expiration_days_text, days_num),
                               mail_body, settings.SERVER_EMAIL,
                               [route.applier.email])
                 except Exception as e: