dronejob 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a310b9d28ba8888a684e9f92c46131ee23085858
-  data.tar.gz: 28b7ffcc75f4011b8355cd44c0a9672420f5e8d5
+  metadata.gz: b555f9cdada7c8119f84414446fbf616e38e8ffe
+  data.tar.gz: a3fdb6dc20761e396025ccb884b4f0164c425758
 SHA512:
-  metadata.gz: 9d3b332ca2191fbdec6fc587461aa156ad57ac01bee4bde8281e225aa03715e7a4a968fd78381b612f25b7a8bfcef92114a92c205704bbd9f0359a766f371541
-  data.tar.gz: f9b6f3f71e441f7d29f8ac3d8277be31f0d1e36661dcafafbdb930b18f6c3226137fe12035c8b966456b76ebcca4dfe469f52502f34352497f5c5312356aebfb
+  metadata.gz: 56345d732edfb887ab2eb8429898cec48bb28d9cd9a6da3da4b9ff17b7ef8c20549867d3b88dedee7a5756510f13b8d8b989d292425177d6953f39917d47be81
+  data.tar.gz: ce4181b1692c3f9c754b874e0c235ed6655eb5d1a0f63307ae781483cd0d86b465e2a68ce0974d96337b60795ab6aae0e5cec4fa8ea8cd94a92158ed21248201

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (2.0.0)
+    dronejob (2.0.1)
       actionpack (>= 4.0.2)
       activejob (>= 4.0.2)
       activejob-google_cloud_pubsub (>= 0.7)
@@ -72,10 +72,10 @@ GEM
       google-gax (~> 1.3)
       googleapis-common-protos-types (>= 1.0.2)
       stackdriver-core (~> 1.3)
-    google-cloud-pubsub (0.30.2)
+    google-cloud-pubsub (0.35.0)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
+      google-gax (~> 1.3)
       grpc-google-iam-v1 (~> 0.6.9)
     google-gax (1.5.0)
       google-protobuf (~> 3.2)
@@ -151,7 +151,7 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     rainbow (3.0.0)
     rly (0.2.3)
-    rmagick (2.16.0)
+    rmagick (3.1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -190,20 +190,20 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
-    workspace (1.0.15)
+    workspace (1.0.16)
       bundler (>= 1.12.0, < 3.0.0)
-      mime-types (~> 3.1)
-    workspace-archive (1.0.15)
+      mime-types (~> 3.2)
+    workspace-archive (1.0.16)
       rubyzip (~> 1.2)
       workspace (~> 1.0)
-    workspace-media (1.0.15)
+    workspace-media (1.0.16)
       piet (~> 0.2)
-      rmagick (~> 2.16)
+      rmagick (~> 3.1)
       workspace (~> 1.0)
-    workspace-net (1.0.15)
+    workspace-net (1.0.16)
       typhoeus (~> 1.3)
       workspace (~> 1.0)
-    workspace-parse (1.0.15)
+    workspace-parse (1.0.16)
       haml (~> 5.0)
       workspace (~> 1.0)
 

data/lib/dronejob/modules/log.rb

@@ -21,7 +21,7 @@ module Dronejob
           elsif dronejob_log == "google"
             logging = Google::Cloud::Logging.new(project: option(:google_cloud_project_id))
             resource = logging.resource("gce_instance", { zone: option(:google_cloud_zone), instance_id: option(:google_cloud_instance_id) })
-            custom_logger = logging.logger("drone", resource)
+            custom_logger = logging.logger(option(:dronejob_queue), resource)
           else
             custom_logger = ActiveSupport::Logger.new(dronejob_log)
           end
@@ -33,11 +33,9 @@ module Dronejob
         def log(level, message, job = nil)
           if !logger.nil?
             if option(:dronejob_log) == "google"
-              message = "[#{job.job_id}] #{message}" if level != :error
-              data = { message: message, job_id: job.job_id, queue: job.queue_name, phase: "none" }
-              # data[:phase] = job.phase.to_s if job.phase
-              # data[:user_id] = job.param(:user_id) if job.param(:user_id)
-              data[:phase_title] = job.phase_config[:title].to_s if job.phase_config&.key?(:title)
+              message = "[#{job&.job_id}] #{message}" if level != :error
+              data = { message: message, job_id: job&.job_id, queue: job&.queue_name, phase: "none" }
+              data[:phase_title] = job.phase_config[:title].to_s if job&.phase_config&.key?(:title)
               if job&.phase_config&.key?(:progress)
                 data[:phase_progress] = job.phase_config[:progress]
               end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Tobias Strebitzer