Skip to content

Commit

Permalink
Cleaned up background worker code, requires more fixing to actually use
Browse files Browse the repository at this point in the history
  • Loading branch information
TaaviE committed Mar 31, 2020
1 parent 154da11 commit b489bf8
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions background.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
# SPDX-License-Identifier: AGPL-3.0-only

# Background tasks
from main import celery, mail
from datetime import timedelta

from flask_mail import Message

from main import app, celery, mail, security
from utility import *
from utility_standalone import *
from views import Message, app, security

getLogger().setLevel(Config.LOGLEVEL)
logger = getLogger()
Expand All @@ -26,7 +29,7 @@ def send_security_email(message):
msg.sender = message["sender"]
mail.send(msg)
except Exception:
sentry.captureException()
sentry_sdk.capture_exception()


# Override security email sender
Expand All @@ -44,18 +47,18 @@ def delay_security_email(msg):
"sender": msg.sender}
)
except Exception:
sentry.captureException()
sentry_sdk.capture_exception()


def remind_to_add(rate_limit=True):
logger.info("Started sending adding reminders")
now = datetime.datetime.now()
now = datetime.now()
try:
with open("remind_to_add", "r+") as timer_file:
lastexec = timer_file.read()
lastexec = datetime.datetime(*map(int, reversed(lastexec.split("/"))))
lastexec = datetime(*map(int, reversed(lastexec.split("/"))))

if now - lastexec < datetime.timedelta(days=30):
if now - lastexec < timedelta(days=30):
logger.info(" Adding reminders were rate-limited")
if rate_limit:
return
Expand All @@ -69,7 +72,7 @@ def remind_to_add(rate_limit=True):

for user in User.query:
if user.last_activity_at:
if now - datetime.datetime(*map(int, user.last_activity_at.split("/"))) < datetime.timedelta(days=15):
if now - datetime(*map(int, user.last_activity_at.split("/"))) < timedelta(days=15):
continue

email_to_send = "Tere,\n"
Expand All @@ -87,13 +90,13 @@ def remind_to_add(rate_limit=True):

def remind_to_buy(rate_limit=True):
logger.info("Started sending purchase reminders")
now = datetime.datetime.now()
now = datetime.now()
try:
with open("remind_to_buy", "r+") as timer_file:
lastexec = timer_file.read()
lastexec = datetime.datetime(*map(int, reversed(lastexec.split("/"))))
lastexec = datetime(*map(int, reversed(lastexec.split("/"))))

if now - lastexec < datetime.timedelta(days=15):
if now - lastexec < timedelta(days=15):
logger.info("Buying reminders were rate-limited")
if rate_limit:
return
Expand Down Expand Up @@ -139,13 +142,13 @@ def remind_to_buy(rate_limit=True):

def remind_about_change(rate_limit=True):
logger.info(" Started sending change reminders")
now = datetime.datetime.now()
now = datetime.now()
try:
with open("remind_about_change", "r+") as timer_file:
lastexec = timer_file.read()
lastexec = datetime.datetime(*map(int, reversed(lastexec.split("/"))))
lastexec = datetime(*map(int, reversed(lastexec.split("/"))))

if now - lastexec < datetime.timedelta(hours=6):
if now - lastexec < timedelta(hours=6):
logger.info(" Changing reminders were rate-limited")
if rate_limit:
return
Expand Down

0 comments on commit b489bf8

Please sign in to comment.