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

Allow full clear of completed jobs #503

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Allow full clear of completed jobs #503

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5042af9
Make job_id nullable, to allow job history clear
May 16, 2022
36a6f93
Initial try at SQL logic
May 17, 2022
66daebf
Update update.py
bonnland May 18, 2022
843961f
Remove flag that should always be true
May 18, 2022
5981be3
Match tests to updated behavior
May 18, 2022
39d3551
Match tests to updated behavior
May 18, 2022
60f7580
Match tests to updated behavior
May 18, 2022
1793585
Match tests to updated behavior
May 18, 2022
5d8a759
Match tests to updated behavior
May 18, 2022
9bfd600
Match tests to updated behavior
May 18, 2022
81c5305
Match tests to updated behavior
May 18, 2022
f1b6c68
Match tests to updated behavior
May 18, 2022
08252ea
Match tests to updated behavior
May 18, 2022
80fb8f6
Clarify documentation/description
May 18, 2022
9f22820
Remove the possibility of --keep-curent==False, to avoid duplicate ha…
May 18, 2022
95e5b48
Remove duplicate tests
May 18, 2022
2d31e13
Update comment
May 18, 2022
fa17f7d
Update comment
May 18, 2022
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
Prev Previous commit
Next Next commit
Remove flag that should always be true
  • Loading branch information
CKAN User committed May 18, 2022
commit 843961fff3b6662312904792c7bc75b4599d495b
7 changes: 2 additions & 5 deletions ckanext/harvest/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,15 @@ def clear_harvest_source_history(source_id, keep_current):
if source_id is not None:
tk.get_action("harvest_source_job_history_clear")(context, {
"id": source_id,
"keep_current": keep_current
})
})
return "Cleared job history of harvest source: {0}".format(source_id)
Copy link
Contributor Author

@bonnland bonnland May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note the language used in the return statement. This command is most useful if it clears the "job history", not the entire source history. Perhaps a change in the command name to "clear-job-history" would be better, as it more clearly states the eventual outcome of the command.

else:
# Purge queues, because we clean all harvest jobs and
# objects in the database.
if not keep_current:
purge_queues()
cleared_sources_dicts = tk.get_action(
"harvest_sources_job_history_clear")(context, {
"keep_current": keep_current
})
"harvest_sources_job_history_clear")(context)
return "Cleared job history for all harvest sources: {0} source(s)".format(
len(cleared_sources_dicts))

Expand Down