From 116d6b32785b9e8a3a743806b9765b44c06f63f2 Mon Sep 17 00:00:00 2001 From: rhymes Date: Thu, 21 Mar 2019 18:00:21 +0100 Subject: [PATCH] Replace puts with proper logging (#2139) --- app/labor/email_digest.rb | 4 ++-- app/labor/podcast_feed.rb | 12 ++++++------ app/models/article.rb | 2 +- app/models/organization.rb | 4 ++-- app/models/tweet.rb | 2 +- app/observers/article_observer.rb | 4 ++-- app/observers/comment_observer.rb | 4 ++-- app/observers/organization_observer.rb | 4 ++-- app/observers/reaction_observer.rb | 4 ++-- db/seeds.rb | 2 +- spec/rails_helper.rb | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/labor/email_digest.rb b/app/labor/email_digest.rb index ab37b6f1b..e2d2490ef 100644 --- a/app/labor/email_digest.rb +++ b/app/labor/email_digest.rb @@ -20,8 +20,8 @@ class EmailDigest articles = user_email_heuristic.articles_to_send begin DigestMailer.digest_email(user, articles).deliver - rescue StandardError - puts "Email issue" + rescue StandardError => e + Rails.logger.error("Email issue: #{e}") end end end diff --git a/app/labor/podcast_feed.rb b/app/labor/podcast_feed.rb index 19bf5dfef..762a01e60 100644 --- a/app/labor/podcast_feed.rb +++ b/app/labor/podcast_feed.rb @@ -20,7 +20,7 @@ class PodcastFeed end feed.items.size rescue StandardError => e - puts e.message + Rails.logger.error(e) end def create_new_episode(item, podcast) @@ -35,8 +35,8 @@ class PodcastFeed get_media_url(ep, item, podcast) begin ep.published_at = item.pubDate.to_date - rescue StandardError - puts "not valid date" + rescue StandardError => e + Rails.logger.error("not a valid date: #{e}") end ep.body = item.content_encoded || item.itunes_summary || item.description ep.save! @@ -47,8 +47,8 @@ class PodcastFeed begin episode.published_at = item.pubDate.to_date episode.save - rescue StandardError - puts "not valid date" + rescue StandardError => e + Rails.logger.error("not a valid date: #{e}") end end update_media_url(episode, item) @@ -84,6 +84,6 @@ class PodcastFeed end rescue StandardError message = "something went wrong with #{podcast.title}, #{episode.title} -- #{episode.media_url}" - logger.info message + Rails.logger.error(message) end end diff --git a/app/models/article.rb b/app/models/article.rb index 1a32665ad..573625643 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -414,7 +414,7 @@ class Article < ApplicationRecord duration end rescue StandardError => e - puts e.message + Rails.logger.error(e) end private diff --git a/app/models/organization.rb b/app/models/organization.rb index 6a105dae4..5a0e19c47 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -106,8 +106,8 @@ class Organization < ApplicationRecord articles.find_each do |article| cache_buster.bust(article.path) end - rescue StandardError - puts "Tag issue" + rescue StandardError => e + Rails.logger.error("Tag issue: #{e}") end end handle_asynchronously :bust_cache diff --git a/app/models/tweet.rb b/app/models/tweet.rb index 3534088b8..1802efcdd 100644 --- a/app/models/tweet.rb +++ b/app/models/tweet.rb @@ -26,7 +26,7 @@ class Tweet < ApplicationRecord begin return tweet = try_to_get_tweet(twitter_id_code) rescue StandardError => e - puts e + Rails.logger.error(e) tries += 1 end end diff --git a/app/observers/article_observer.rb b/app/observers/article_observer.rb index 17192106d..4af187e47 100644 --- a/app/observers/article_observer.rb +++ b/app/observers/article_observer.rb @@ -10,7 +10,7 @@ class ArticleObserver < ApplicationObserver end warned_user_ping(article) - rescue StandardError - puts "error" + rescue StandardError => e + Rails.logger.error(e) end end diff --git a/app/observers/comment_observer.rb b/app/observers/comment_observer.rb index 410a0029d..a0a373a03 100644 --- a/app/observers/comment_observer.rb +++ b/app/observers/comment_observer.rb @@ -3,7 +3,7 @@ class CommentObserver < ApplicationObserver return if Rails.env.development? warned_user_ping(comment) - rescue StandardError - puts "error" + rescue StandardError => e + Rails.logger.error(e) end end diff --git a/app/observers/organization_observer.rb b/app/observers/organization_observer.rb index 5fb91cd0e..3d7d89dfd 100644 --- a/app/observers/organization_observer.rb +++ b/app/observers/organization_observer.rb @@ -8,7 +8,7 @@ class OrganizationObserver < ActiveRecord::Observer username: "org_bot", icon_emoji: ":office:", ) - rescue StandardError - puts "error" + rescue StandardError => e + Rails.logger.error(e) end end diff --git a/app/observers/reaction_observer.rb b/app/observers/reaction_observer.rb index 4ce15c800..c39e31ad8 100644 --- a/app/observers/reaction_observer.rb +++ b/app/observers/reaction_observer.rb @@ -8,7 +8,7 @@ class ReactionObserver < ActiveRecord::Observer icon_emoji: ":cry:", ) end - rescue StandardError - puts "observer error" + rescue StandardError => e + Rails.logger.error("observer error: #{e}") end end diff --git a/db/seeds.rb b/db/seeds.rb index e70841d80..48c30b549 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -215,7 +215,7 @@ HtmlVariant.create( ) ############################################################################## -puts <<-ASCII +Rails.logger.info <<-ASCII diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 1db916538..8e034d4eb 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -65,7 +65,7 @@ RSpec.configure do |config| if config.filter_manager.inclusions.rules.include?(:live) WebMock.allow_net_connect! StripeMock.toggle_live(true) - puts "Running **live** tests against Stripe..." + Rails.logger.info("Running **live** tests against Stripe...") end config.before do