canvas_sync 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f87da8705444b3e03423c2a54955af9b716b7b24b895e9f90c0ff8172ebe2c2
-  data.tar.gz: f2ce4110f41ec088b08cb0bab4ad90f2abc1e4559e3e5a120f6d8b8d9d5b8b99
+  metadata.gz: d468a322b8cc5edf0f4ead573a98f9919f3b7158add284a65e7286be41f9bcf1
+  data.tar.gz: 773ebf5c8fa9bb84d60031879ccf4a706344d1c19fcca582eaccf3158334cd37
 SHA512:
-  metadata.gz: 3e564a94d2f9bcaeb2b5a9a8a38702281ac0f1f768ca7d7a1059b194b07e8009650c51c4985fef472ac1697823cf0069f185eace2b706722de8b76312ee59cba
-  data.tar.gz: 8b6bc602f1b40f6599f1327f8ec17119f6debbcf0f6aa82627db4a603267a2935a5538e23a5bacbbfe4b56e0631dc5b9597814d595bacad29c0dd08b02070428
+  metadata.gz: ac310fcd40284364f21ce10df7115ed04dbab603c5d1d773c1809da5db1b29d72f34e06c3645f6b33b3ac7db9648adeb677059033d10c0d9314c69e234a2129e
+  data.tar.gz: 400fbc6c753365b2900802d8b5b6466ccf62a5c9bf96a5857887567361eebda835bf4489f88c66b3db287514752963d914509c8160eff2e97e49fca913e7b80f

data/README.md

@@ -219,6 +219,16 @@ If you want your own jobs to also log to the table all you have to do is have yo
 @job_log.save!
 ```
 
+If you want to be able to utilize the `CanvasSync::JobLog` without `ActiveJob` (so you can get access to `Sidekiq` features that `ActiveJob` doesn't support), then add the following to an initializer in your Rails app:
+
+```
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add CanvasSync::Sidekiq::Middleware
+  end
+end
+```
+
 ## Upgrading
 
 Re-running the generator when there's been a gem change will give you several choices if it detects conflicts between your local files and the updated generators. You can either view a diff or allow the generator to overwrite your local file. In most cases you may just want to add the code from the diff yourself so as not to break any of your customizations.

data/lib/canvas_sync.rb

@@ -2,6 +2,7 @@ require "bearcat"
 require "canvas_sync/version"
 require "canvas_sync/engine"
 require "canvas_sync/job"
+require "canvas_sync/sidekiq_job"
 require "canvas_sync/jobs/report_starter"
 require "canvas_sync/jobs/report_checker"
 require "canvas_sync/jobs/report_processor_job"

data/lib/canvas_sync/sidekiq_job.rb

@@ -0,0 +1,32 @@
+module CanvasSync
+  module Sidekiq
+    class Middleware
+      def call(worker, job, queue)
+        begin
+          job_log = CanvasSync::JobLog.create(
+            job_class: worker.class.to_s,
+            job_arguments: job["args"],
+            job_id: job["jid"],
+            status: JobLog::RUNNING_STATUS,
+            started_at: Time.now
+          )
+
+          yield
+          job_log.status = JobLog::SUCCESS_STATUS
+        rescue => e
+          job_log.exception = "#{e.class}: #{e.message}"
+          job_log.backtrace = e.backtrace
+          job_log.status = JobLog::ERROR_STATUS
+          raise e
+        ensure
+          if job_log.job_class == "CanvasSync::Jobs::ReportChecker" && job_log.status != JobLog::ERROR_STATUS
+            job_log.destroy
+          else
+            job_log.completed_at = Time.now
+            job_log.save!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -401,6 +401,7 @@ files:
 - lib/canvas_sync/processors/provisioning_report_processor.rb
 - lib/canvas_sync/processors/report_processor.rb
 - lib/canvas_sync/processors/submissions_processor.rb
+- lib/canvas_sync/sidekiq_job.rb
 - lib/canvas_sync/version.rb
 - spec/canvas_sync/canvas_sync_spec.rb
 - spec/canvas_sync/jobs/job_spec.rb