Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase printing and add dryrun checks to purge cycle #2

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Increase printing and add dryrun checks to purge cycle #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
545d5ec
Increase printing and add dryrun checks to purge cycle
cat-bro Feb 21, 2024
bce9d4e
add more print
cat-bro Feb 21, 2024
e49303c
fix typo
cat-bro Feb 21, 2024
f4fd46c
Update counters
cat-bro Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions history_mailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,31 +752,41 @@ def main(dryrun=True, production=False, do_delete=False, force=False, notify=Fal

if history_is_deleted is False:
# User has restored history
history.status = "Restored"
db_session.add(history)
db_session.commit()
if not dryrun:
history.status = "Restored"
db_session.add(history)
db_session.commit()
num_restored += 1
print(f"History {history.id} is no longer in deleted state")

elif history.status != "Purged":
num_threshold += 1
if history_is_purged:
# User has purged history, or history has taken a long time to purge in a previous week,
# resulting in 504 status from delete request
history.status = "Purged"
db_session.add(history)
db_session.commit()
if not dryrun:
history.status = "Purged"
db_session.add(history)
db_session.commit()
num_previous += 1
print(f"History {history.id} is already in purged state")
continue
num_threshold += 1
rem_result = remove_history(history.id, purge=True)
if rem_result:
elif not dryrun:
rem_result = remove_history(history.id, purge=True)
if rem_result:
num_purged += 1
hist_size += history.size
history.status = "Purged"
db_session.add(history)
db_session.commit()
print(f"Purged history: {history.id}")
else:
num_error += 1
print(f"Unable to purge history: {history.id}")
if dryrun: # dryrun option set: nothing is removed, assume everything would return 200
print(f"Dry run. Would purge history: {history.id}")
num_purged += 1
hist_size += history.size
history.status = "Purged"
db_session.add(history)
db_session.commit()
else:
num_error += 1
print(f"Unable to purge history: {history.id}")
else:
num_previous += 1

Expand Down