[ARVADOS] updated: 2.1.0-1188-gbe2e29a90
Git user
git at public.arvados.org
Thu Aug 12 20:21:52 UTC 2021
Summary of changes:
services/api/lib/tasks/manage_long_lived_tokens.rake | 4 ++++
1 file changed, 4 insertions(+)
via be2e29a903a53d7565f1a52d0bebe5e5e337a1cd (commit)
from 377467f5285670a797ec02b4ca6c5a129c289a39 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit be2e29a903a53d7565f1a52d0bebe5e5e337a1cd
Author: Ward Vandewege <ward at curii.com>
Date: Thu Aug 12 16:21:40 2021 -0400
18013: address review feedback.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/services/api/lib/tasks/manage_long_lived_tokens.rake b/services/api/lib/tasks/manage_long_lived_tokens.rake
index 8700f20f5..d83c2b603 100644
--- a/services/api/lib/tasks/manage_long_lived_tokens.rake
+++ b/services/api/lib/tasks/manage_long_lived_tokens.rake
@@ -17,6 +17,7 @@ namespace :db do
end
if lifetime.nil? or lifetime == 0
puts("No expiration policy set (API.MaxTokenLifetime nor Login.TokenLifetime is set), nothing to do.")
+ # abort the rake task
next
end
exp_date = Time.now + lifetime
@@ -25,6 +26,7 @@ namespace :db do
ll_tokens(lifetime).each do |auth|
if auth.user.nil?
printf("*** WARNING, found ApiClientAuthorization with invalid user: auth id: %d, user id: %d\n", auth.id, auth.user_id)
+ # skip this token
next
end
if (auth.user.uuid =~ /-tpzed-000000000000000/).nil?
@@ -45,6 +47,7 @@ namespace :db do
end
if lifetime.nil? or lifetime == 0
puts("No expiration policy set (API.MaxTokenLifetime nor Login.TokenLifetime is set), nothing to do.")
+ # abort the rake task
next
end
user_ids = Set.new()
@@ -52,6 +55,7 @@ namespace :db do
ll_tokens(lifetime).each do |auth|
if auth.user.nil?
printf("*** WARNING, found ApiClientAuthorization with invalid user: auth id: %d, user id: %d\n", auth.id, auth.user_id)
+ # skip this token
next
end
if not auth.user.nil? and (auth.user.uuid =~ /-tpzed-000000000000000/).nil?
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list