Fixed a problem with the expire-ids code, and added logging to catch future problems.

- Legacy-Id: 15051
This commit is contained in:
Henrik Levkowetz 2018-04-18 12:34:31 +00:00
parent 12d999a384
commit 18b9d8b400

View file

@ -17,18 +17,23 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
import django
django.setup()
from ietf.doc.expire import ( in_draft_expire_freeze, get_expired_drafts, expirable_draft,
from ietf.utils.log import logger
try:
from ietf.doc.expire import ( in_draft_expire_freeze, get_expired_drafts, expirable_draft,
send_expire_notice_for_draft, expire_draft, clean_up_draft_files )
if not in_draft_expire_freeze():
if not in_draft_expire_freeze():
syslog.syslog("Expiring drafts ...")
for doc in get_expired_drafts():
# verify expirability -- it might have changed after get_expired_drafts() was run
# (this whole loop took about 2 minutes on 04 Jan 2018)
if expirable_draft(doc) and doc.expires < datetime.date.today() + datetime.timedelta(1):
if expirable_draft(doc) and doc.expires < datetime.datetime.today() + datetime.timedelta(1):
send_expire_notice_for_draft(doc)
expire_draft(doc)
syslog.syslog(" Expired draft %s-%s" % (doc.name, doc.rev))
syslog.syslog("Cleaning up draft files")
clean_up_draft_files()
syslog.syslog("Cleaning up draft files")
clean_up_draft_files()
except Exception as e:
logger.error("Exception in expire-ids: %s" % e)