From b62293571cac9d600ecc7bcb672896dd5b2ebc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Miedes=20Garc=C3=A9s?= <albertomg994@gmail.com>
Date: Mon, 31 Aug 2020 17:01:15 +0200
Subject: [PATCH] Replace CartoDB::Logger::RollbarLogger per
 ResqueFailureLogger

---
 config/initializers/load_resque.rb |  2 +-
 lib/cartodb/logger.rb              | 13 -------------
 lib/resque_failure_logger.rb       | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 lib/resque_failure_logger.rb

diff --git a/config/initializers/load_resque.rb b/config/initializers/load_resque.rb
index 2b8883c991..e99b79af42 100644
--- a/config/initializers/load_resque.rb
+++ b/config/initializers/load_resque.rb
@@ -9,7 +9,7 @@ Dir[Rails.root.join("lib/resque/*.rb")].each {|f| require f}
 
 Resque.redis = RedisFactory.new_connection
 
-Resque::Failure::Multiple.classes = [Resque::Failure::Redis, CartoDB::Logger::RollbarLogger]
+Resque::Failure::Multiple.classes = [Resque::Failure::Redis, ResqueFailureLogger]
 Resque::Failure.backend = Resque::Failure::Multiple
 
 ## Logging
diff --git a/lib/cartodb/logger.rb b/lib/cartodb/logger.rb
index cd21ff672c..d186692daa 100644
--- a/lib/cartodb/logger.rb
+++ b/lib/cartodb/logger.rb
@@ -44,19 +44,6 @@ module CartoDB
       log('debug', exception: exception, message: message, user: user, **additional_data)
     end
 
-    class RollbarLogger < Resque::Failure::Base
-      def save
-        Logger.error(
-          message: 'Uncaught Resque failure',
-          exception: exception,
-          host: worker.hostname,
-          pid: worker.pid,
-          job: payload['class'],
-          args: payload['args']
-        )
-      end
-    end
-
     # Private
 
     # Creates a Rollbar scope that replaces the auto-detected person with the user passed as parameter
diff --git a/lib/resque_failure_logger.rb b/lib/resque_failure_logger.rb
new file mode 100644
index 0000000000..e72982371a
--- /dev/null
+++ b/lib/resque_failure_logger.rb
@@ -0,0 +1,19 @@
+# TODO: move to Carto::Common::JobLogger
+
+class ResqueFailureLogger < Resque::Failure::Base
+
+  include ::LoggerHelper
+
+  def save
+    log_error(
+      message: 'Job failed',
+      component: 'cartodb.resque',
+      exception: exception,
+      worker: { pid: worker.pid, hostname: worker.hostname },
+      job_class: payload['class'],
+      args: payload['args'].inspect,
+      run_at: worker.job["run_at"]
+    )
+  end
+
+end