Skip to content

Commit 7a39a0f

Browse files
committed
Add logging to remaining jobs
1 parent 9d78cba commit 7a39a0f

7 files changed

Lines changed: 45 additions & 20 deletions

app/jobs/clean_up_new_thread_followers_job.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ def perform
1616
result = duplicate.destroy
1717

1818
unless result
19-
puts "failed to destroy new thread follower duplicate \"#{duplicate.id}\""
19+
logger.warn "Failed to destroy new thread follower duplicate \"#{duplicate.id}\. Validations follow."
20+
duplicate.errors.full_messages.each do |msg|
21+
logger.warn msg
22+
end
2023
duplicate.errors.each { |e| puts e.full_message }
2124
end
2225
end
26+
27+
logger.info "Processed #{posts.size} posts."
2328
end
2429
end

app/jobs/clean_up_spammy_users_job.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ def perform(created_after: 1.month.ago)
99
.where(users: { deleted: false }).group('users.id').having('count(posts.id) > 0')
1010
.having('count(distinct if(posts.deleted = true, null, posts.id)) = 0')
1111

12+
blocked = 0
13+
1214
possible_spammers.each do |spammer|
1315
all_posts_spam = spammer.posts.all? do |post|
1416
# A post is considered spam if there are any helpful spam flags on it.
@@ -17,9 +19,12 @@ def perform(created_after: 1.month.ago)
1719
end
1820
end
1921
if all_posts_spam
22+
blocked += 1
2023
spammer.block('automatic block from spam cleanup job', length: 2.years)
2124
spammer.soft_delete(User.system)
2225
end
2326
end
27+
28+
logger.info "Considered #{possible_spammers.count} potential spammers, blocked #{blocked}."
2429
end
2530
end

app/jobs/clean_up_thread_followers_job.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ def perform
1616
result = duplicate.destroy
1717

1818
unless result
19-
puts "failed to destroy thread follower duplicate \"#{duplicate.id}\""
19+
logger.warn "Failed to destroy thread follower duplicate \"#{duplicate.id}\. Validations follow."
20+
duplicate.errors.full_messages.each do |msg|
21+
logger.warn msg
22+
end
2023
duplicate.errors.each { |e| puts e.full_message }
2124
end
2225
end
26+
27+
logger.info "Processed #{threads.size} threads."
2328
end
2429
end

app/jobs/cleanup_votes_job.rb

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,33 @@ class CleanupVotesJob < ApplicationJob
33

44
def perform
55
Community.all.each do |c|
6-
RequestContext.community = c
7-
orphan_votes = Vote.all.reject { |v| v.post.present? }
6+
logger.tagged(c.name) do
7+
RequestContext.community = c
8+
orphan_votes = Vote.all.reject { |v| v.post.present? }
89

9-
puts "[#{c.name}] destroying #{orphan_votes.length} #{'orphan vote'.pluralize(orphan_votes.length)}"
10+
logger.info "Removing #{orphan_votes.length} #{'orphan vote'.pluralize(orphan_votes.length)}"
1011

11-
system_user = User.find(-1)
12+
system_user = User.find(-1)
1213

13-
orphan_votes.each do |v|
14-
result = v.destroy
14+
orphan_votes.each do |v|
15+
result = v.destroy
1516

16-
if result
17-
AuditLog.admin_audit(
18-
comment: "Deleted orphaned vote for user ##{v.recv_user_id} " \
19-
"on post ##{v.post_id} " \
20-
"in community ##{c.id} (#{c.name})",
21-
event_type: 'vote_delete',
22-
related: v,
23-
user: system_user
24-
)
25-
else
26-
puts "[#{c.name}] failed to destroy vote \"#{v.id}\""
27-
v.errors.each { |e| puts e.full_message }
17+
if result
18+
AuditLog.admin_audit(
19+
comment: "Deleted orphaned vote for user ##{v.recv_user_id} " \
20+
"on post ##{v.post_id} " \
21+
"in community ##{c.id} (#{c.name})",
22+
event_type: 'vote_delete',
23+
related: v,
24+
user: system_user
25+
)
26+
else
27+
logger.warn "Failed to remove vote #{v.id}. Validations follow."
28+
v.errors.full_messages.each do |msg|
29+
logger.warn msg
30+
end
31+
v.errors.each { |e| puts e.full_message }
32+
end
2833
end
2934
end
3035
end

app/jobs/potential_spam_profiles_job.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ def perform
1414
UserAbility.where(community_user_id: cu_ids, ability_id: ability_ids)
1515
.update_all(is_suspended: true, suspension_message: 'This ability has been automatically suspended.')
1616
end
17+
18+
logger.info "Found #{users.size} likely spam profiles & suspended abilities."
1719
end
1820
end

app/jobs/send_summary_emails_job.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@ def perform
1515
.content_summary
1616
.deliver_later
1717
end
18+
19+
logger.info "Scheduled send of #{staff.size} emails."
1820
end
1921
end

config/initializers/job_logger.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ def job_logger
66
if @job_logger.nil?
77
logger = ActiveSupport::Logger.new(Rails.root.join('log/jobs.log'))
88
logger.level = ActiveSupport::Logger::INFO
9+
logger.formatter = ::Logger::Formatter.new
910
@job_logger = ActiveSupport::TaggedLogging.new(logger)
1011
else
1112
@job_logger

0 commit comments

Comments
 (0)