From eb7d2ce629ac03651d955a036fae66aefe9d90a3 Mon Sep 17 00:00:00 2001 From: Ian Rees Date: Mon, 12 Dec 2016 15:55:12 -0800 Subject: [PATCH 1/2] Use global log for logger.info --- app/workers/changeset_apply_worker.rb | 2 +- app/workers/feed_activation_worker.rb | 2 +- app/workers/feed_deactivation_worker.rb | 2 +- app/workers/feed_eater_schedule_worker.rb | 8 ++++---- app/workers/feed_eater_worker.rb | 10 +++++----- app/workers/feed_fetcher_worker.rb | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/workers/changeset_apply_worker.rb b/app/workers/changeset_apply_worker.rb index 9bb8c3484..1faeb8938 100644 --- a/app/workers/changeset_apply_worker.rb +++ b/app/workers/changeset_apply_worker.rb @@ -6,7 +6,7 @@ class ChangesetApplyWorker retry: false def perform(changeset_id, cachekey) - logger.info "ChangesetApplyWorker: #{changeset_id}" + log "ChangesetApplyWorker: #{changeset_id}" # Processing errors = [] warnings = [] diff --git a/app/workers/feed_activation_worker.rb b/app/workers/feed_activation_worker.rb index 762564629..372cf34be 100644 --- a/app/workers/feed_activation_worker.rb +++ b/app/workers/feed_activation_worker.rb @@ -2,7 +2,7 @@ class FeedActivationWorker include Sidekiq::Worker def perform(feed_onestop_id, feed_version_sha1, import_level) - logger.info "FeedActivationWorker #{feed_onestop_id}: activating #{feed_version_sha1} at import_level #{import_level}" + log "FeedActivationWorker #{feed_onestop_id}: activating #{feed_version_sha1} at import_level #{import_level}" # Find Feed & FeedVersions feed = Feed.find_by_onestop_id!(feed_onestop_id) new_active_feed_version = feed.feed_versions.find_by!(sha1: feed_version_sha1) diff --git a/app/workers/feed_deactivation_worker.rb b/app/workers/feed_deactivation_worker.rb index c4d29c080..248fee90e 100644 --- a/app/workers/feed_deactivation_worker.rb +++ b/app/workers/feed_deactivation_worker.rb @@ -2,7 +2,7 @@ class FeedDeactivationWorker include Sidekiq::Worker def perform(feed_onestop_id, feed_version_sha1) - logger.info "FeedDeactivationWorker #{feed_onestop_id}: deactivating #{feed_version_sha1}" + log "FeedDeactivationWorker #{feed_onestop_id}: deactivating #{feed_version_sha1}" # Find Feed & FeedVersions feed = Feed.find_by_onestop_id!(feed_onestop_id) old_active_feed_version = feed.feed_versions.find_by!(sha1: feed_version_sha1) diff --git a/app/workers/feed_eater_schedule_worker.rb b/app/workers/feed_eater_schedule_worker.rb index 74d9cb491..5bb8bc757 100644 --- a/app/workers/feed_eater_schedule_worker.rb +++ b/app/workers/feed_eater_schedule_worker.rb @@ -4,7 +4,7 @@ class FeedEaterScheduleWorker sidekiq_options queue: :feed_eater_schedule, retry: false def perform(feed_onestop_id, feed_version_sha1, feed_schedule_import_id, trip_ids, agency_map, route_map, stop_map, rsp_map) - logger.info "FeedEaterScheduleWorker #{feed_onestop_id}: Importing #{trip_ids.size} trips" + log "FeedEaterScheduleWorker #{feed_onestop_id}: Importing #{trip_ids.size} trips" feed = Feed.find_by(onestop_id: feed_onestop_id) feed_version = FeedVersion.find_by(sha1: feed_version_sha1) feed_schedule_import = FeedScheduleImport.find(feed_schedule_import_id) @@ -25,10 +25,10 @@ def perform(feed_onestop_id, feed_version_sha1, feed_schedule_import_id, trip_id feed_schedule_import.failed(exception_log: exception_log) Raven.capture_exception(e) if defined?(Raven) else - logger.info "FeedEaterScheduleWorker #{feed_onestop_id}: Saving successful schedule import" + log "FeedEaterScheduleWorker #{feed_onestop_id}: Saving successful schedule import" feed_schedule_import.succeeded if feed_schedule_import.all_succeeded? - logger.info "FeedEaterScheduleWorker #{feed_onestop_id}: Enqueing FeedActivationWorker: #{feed.onestop_id} #{feed_version.sha1}, import_level #{import_level}" + log "FeedEaterScheduleWorker #{feed_onestop_id}: Enqueing FeedActivationWorker: #{feed.onestop_id} #{feed_version.sha1}, import_level #{import_level}" FeedActivationWorker.perform_async( feed.onestop_id, feed_version.sha1, @@ -37,7 +37,7 @@ def perform(feed_onestop_id, feed_version_sha1, feed_schedule_import_id, trip_id end ensure feed_version.file.remove_any_local_cached_copies - logger.info "FeedEaterScheduleWorker #{feed_onestop_id}: Saving log" + log "FeedEaterScheduleWorker #{feed_onestop_id}: Saving log" feed_schedule_import.update(import_log: graph.try(:import_log)) end end diff --git a/app/workers/feed_eater_worker.rb b/app/workers/feed_eater_worker.rb index b895f2109..955e0eab5 100644 --- a/app/workers/feed_eater_worker.rb +++ b/app/workers/feed_eater_worker.rb @@ -24,7 +24,7 @@ def perform(feed_onestop_id, feed_version_sha1=nil, import_level=0) # Import feed graph = nil begin - logger.info "FeedEaterWorker #{feed_onestop_id}: Importing feed at import level #{import_level}" + log "FeedEaterWorker #{feed_onestop_id}: Importing feed at import level #{import_level}" graph = GTFSGraph.new(feed, feed_version) graph.cleanup graph.create_change_osr @@ -37,7 +37,7 @@ def perform(feed_onestop_id, feed_version_sha1=nil, import_level=0) schedule_jobs << [feed_schedule_import.id, trip_ids, agency_map, route_map, stop_map, rsp_map] end schedule_jobs.each do |feed_schedule_import_id, trip_ids, agency_map, route_map, stop_map, rsp_map| - logger.info "FeedEaterWorker #{feed_onestop_id}: Enqueue schedule job" + log "FeedEaterWorker #{feed_onestop_id}: Enqueue schedule job" FeedEaterScheduleWorker.perform_async(feed.onestop_id, feed_version.sha1, feed_schedule_import_id, trip_ids, agency_map, route_map, stop_map, rsp_map) end end @@ -46,19 +46,19 @@ def perform(feed_onestop_id, feed_version_sha1=nil, import_level=0) # SignalException, and SyntaxError exception_log = "\n#{e}\n#{e.backtrace}\n" logger.error exception_log - logger.info "FeedEaterWorker #{feed_onestop_id}: Saving failed feed import" + log "FeedEaterWorker #{feed_onestop_id}: Saving failed feed import" feed_version_import.failed(exception_log: exception_log) Raven.capture_exception(e) if defined?(Raven) else # Enqueue FeedEaterScheduleWorker jobs, or save successful import. if import_level < 2 - logger.info "FeedEaterWorker #{feed_onestop_id}: Saving successful feed import" + log "FeedEaterWorker #{feed_onestop_id}: Saving successful feed import" feed_version_import.succeeded end ensure feed_version.file.remove_any_local_cached_copies # Save logs and reports - logger.info "FeedEaterWorker #{feed_onestop_id}: Saving log" + log "FeedEaterWorker #{feed_onestop_id}: Saving log" feed_version_import.update(import_log: graph.try(:import_log)) end end diff --git a/app/workers/feed_fetcher_worker.rb b/app/workers/feed_fetcher_worker.rb index a8ade8e5e..fad83078d 100644 --- a/app/workers/feed_fetcher_worker.rb +++ b/app/workers/feed_fetcher_worker.rb @@ -7,12 +7,12 @@ class FeedFetcherWorker def perform(feed_onestop_id) begin feed = Feed.find_by_onestop_id!(feed_onestop_id) - logger.info "FeedFetcherWorker checking #{feed.onestop_id}" + log "FeedFetcherWorker checking #{feed.onestop_id}" feed_version = FeedFetcherService.fetch_and_return_feed_version(feed) if feed_version - logger.info "FeedFetcherWorker checked #{feed.onestop_id} and found sha1: #{feed_version.sha1}" + log "FeedFetcherWorker checked #{feed.onestop_id} and found sha1: #{feed_version.sha1}" else - logger.info "FeedFetcherWorker checked #{feed.onestop_id} and didn't return a FeedVersion" + log "FeedFetcherWorker checked #{feed.onestop_id} and didn't return a FeedVersion" end rescue Exception => e # NOTE: we're catching all exceptions, including Interrupt, From af96f6c87577a18a7baafcdfee56c957d90af2a6 Mon Sep 17 00:00:00 2001 From: Ian Rees Date: Mon, 12 Dec 2016 15:56:48 -0800 Subject: [PATCH 2/2] Use global log, :error for logger.error --- app/models/changeset.rb | 6 +++--- app/workers/feed_eater_schedule_worker.rb | 2 +- app/workers/feed_eater_worker.rb | 2 +- app/workers/feed_fetcher_worker.rb | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 1f5bc7ee5..9239208c6 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -255,7 +255,7 @@ def cycle_issues(issues_changeset_is_resolving, new_issues_created_by_changeset, .each(&:deprecate) else message = unresolved_issues.map { |issue| "Issue #{issue.id} was not resolved." }.join(" ") - logger.error "Error applying Changeset #{self.id}: #{message}" + log "Error applying Changeset #{self.id}: #{message}", :error raise Changeset::Error.new(changeset: self, message: message) end end @@ -290,8 +290,8 @@ def apply! cycle_issues(issues_changeset_is_resolving, new_issues_created_by_changeset, old_issues_to_deprecate) rescue StandardError => error - logger.error "Error applying Changeset #{self.id}: #{error.message}" - logger.error error.backtrace + log "Error applying Changeset #{self.id}: #{error.message}", :error + log error.backtrace, :error raise Changeset::Error.new(changeset: self, message: error.message, backtrace: error.backtrace) end end diff --git a/app/workers/feed_eater_schedule_worker.rb b/app/workers/feed_eater_schedule_worker.rb index 5bb8bc757..1fc9e428e 100644 --- a/app/workers/feed_eater_schedule_worker.rb +++ b/app/workers/feed_eater_schedule_worker.rb @@ -21,7 +21,7 @@ def perform(feed_onestop_id, feed_version_sha1, feed_schedule_import_id, trip_id ) rescue Exception => e exception_log = "\n#{e}\n#{e.backtrace}\n" - logger.error exception_log + log exception_log, :error feed_schedule_import.failed(exception_log: exception_log) Raven.capture_exception(e) if defined?(Raven) else diff --git a/app/workers/feed_eater_worker.rb b/app/workers/feed_eater_worker.rb index 955e0eab5..8c8718330 100644 --- a/app/workers/feed_eater_worker.rb +++ b/app/workers/feed_eater_worker.rb @@ -45,7 +45,7 @@ def perform(feed_onestop_id, feed_version_sha1=nil, import_level=0) # NOTE: we're catching all exceptions, including Interrupt, # SignalException, and SyntaxError exception_log = "\n#{e}\n#{e.backtrace}\n" - logger.error exception_log + log exception_log, :error log "FeedEaterWorker #{feed_onestop_id}: Saving failed feed import" feed_version_import.failed(exception_log: exception_log) Raven.capture_exception(e) if defined?(Raven) diff --git a/app/workers/feed_fetcher_worker.rb b/app/workers/feed_fetcher_worker.rb index fad83078d..6bafe0b1c 100644 --- a/app/workers/feed_fetcher_worker.rb +++ b/app/workers/feed_fetcher_worker.rb @@ -17,8 +17,8 @@ def perform(feed_onestop_id) rescue Exception => e # NOTE: we're catching all exceptions, including Interrupt, # SignalException, and SyntaxError - logger.error e.message - logger.error e.backtrace + log e.message, :error + log e.backtrace, :error Raven.capture_exception(e) if defined?(Raven) end end