dronejob 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfd8ac0ec0f3c42437f261312181343d0d9bdfd
-  data.tar.gz: 3fdd973138c87d530f10c6152132af735677b2a9
+  metadata.gz: 7e08177ceade5bbe5e6cc87316b4c6c5bd797613
+  data.tar.gz: f8d6934e24e5055edd50b51c982c9c122275f8e5
 SHA512:
-  metadata.gz: b13c19f1ed12513f7e098f23dcbf2c12891c4bf54a225cb7f62289cca66f64b9baecf66e84af77f2afb11e5fb699a28248cdf8a322eb936e3795520a0a45a300
-  data.tar.gz: bab1f5e66d09f420738278acd32dd3208727122cc7a5400fb5241d47c6919d1cad1930882d50925dde1d6be1691203c2a55a3a386db5cb840b9b826e54f354fa
+  metadata.gz: a66d0011224e6351b3cf34664ae90ef97c928cf0fd7b2fafdd1268a8c0d714ead324046cf053c35aeb81df6e8a972559a98c74d855f059b1b970cedf61100de5
+  data.tar.gz: c6a7aa834e83ed43d9c400e4f80a062875bf4f46d1f53c56547d44945c8e0397fd68374925da5253120863537bae399be8cc84a91dd7c1b7f6086c0baba6f785

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    dronejob (1.2.8)
+    dronejob (1.2.9)
       actionpack (>= 4.0)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
       git (~> 1.2)
-      google-cloud-storage (~> 0.21)
+      google-cloud-logging (~> 0.23)
+      google-cloud-storage (~> 0.23)
       haml (~> 4.0)
       open_uri_redirections (~> 0.2)
       rubyzip (~> 1.1)
@@ -42,22 +43,22 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    builder (3.2.2)
+    builder (3.2.3)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     diff-lcs (1.2.5)
     digest-crc (0.4.1)
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     git (1.3.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    google-api-client (0.9.20)
+    google-api-client (0.9.28)
       addressable (~> 2.3)
       googleauth (~> 0.5)
       httpclient (~> 2.7)
@@ -68,10 +69,27 @@ GEM
       retriable (~> 2.0)
     google-cloud-core (0.21.1)
       googleauth (~> 0.5.1)
-    google-cloud-storage (0.23.0)
+    google-cloud-logging (0.23.2)
+      google-cloud-core (~> 0.21.1)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+      orderedhash (= 0.0.6)
+      stackdriver-core (~> 0.21.0)
+    google-cloud-storage (0.23.1)
       digest-crc (~> 0.4)
       google-api-client (~> 0.9.11)
       google-cloud-core (~> 0.21.0)
+    google-gax (0.6.0)
+      googleapis-common-protos (~> 1.3.1)
+      googleauth (~> 0.5.1)
+      grpc (~> 1.0)
+      rly (~> 0.2.3)
+    google-protobuf (3.2.0)
+    googleapis-common-protos (1.3.4)
+      google-protobuf (~> 3.0)
+      grpc (~> 1.0)
     googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
@@ -80,12 +98,15 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
+    grpc (1.1.2)
+      google-protobuf (~> 3.1)
+      googleauth (~> 0.5.1)
     haml (4.0.7)
       tilt
     httpclient (2.8.3)
     hurley (0.2)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.8.0)
+    json (1.8.6)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -102,15 +123,16 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     open_uri_redirections (0.2.1)
+    orderedhash (0.0.6)
     os (0.9.6)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
@@ -118,16 +140,17 @@ GEM
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    redis (3.3.2)
+    redis (3.3.3)
     representable (2.3.0)
       uber (~> 0.0.7)
     retriable (2.1.0)
+    rly (0.2.3)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -141,8 +164,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubyzip (1.2.0)
-    sidekiq (4.2.7)
+    rubyzip (1.2.1)
+    sidekiq (4.2.9)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -155,9 +178,10 @@ GEM
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.6.0)
+    stackdriver-core (0.21.0)
     thor (0.19.4)
     thread_safe (0.3.5)
-    tilt (2.0.5)
+    tilt (2.0.6)
     typhoeus (1.1.2)
       ethon (>= 0.9.0)
     tzinfo (1.2.2)
@@ -173,4 +197,4 @@ DEPENDENCIES
   rspec (~> 3.3)
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/dronejob.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "typhoeus", "~> 1.0"
   s.add_runtime_dependency "actionpack", ">= 4.0"
   s.add_runtime_dependency "open_uri_redirections", "~> 0.2"
-  s.add_runtime_dependency "google-cloud-storage", "~> 0.21"
+  s.add_runtime_dependency "google-cloud-storage", "~> 0.23"
+  s.add_runtime_dependency "google-cloud-logging", "~> 0.23"
   s.add_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"
   s.files        = `git ls-files`.split("\n")

data/lib/dronejob/modules/log.rb

@@ -17,6 +17,10 @@ module Dronejob
           dronejob_log = option(:dronejob_log) || "STDOUT"
           if dronejob_log == "STDOUT"
             custom_logger = ActiveSupport::Logger.new(STDOUT)
+          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)
           else
             custom_logger = ActiveSupport::Logger.new(dronejob_log)
           end
@@ -25,17 +29,27 @@ module Dronejob
       end
       
       class_methods do
-        def log(level, message, phase=:global)
+        def log(level, message, job)
           if !logger.nil?
-            logger.send(level, message)
+            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 and job.phase_config[:title]
+              data[:phase_progress] = job.phase_config[:progress] if job.phase_config and job.phase_config[:progress]
+              logger.send(level, data.compact)
+            else
+              logger.send(level, message)
+            end
           else
-            puts "#{level}: [#{phase}] #{message}"
+            puts "#{level}: [#{job.phase}] #{message}"
           end
         end
       end
       
       def log(level, message)
-        self.class.log(level, message, @phase)
+        self.class.log(level, message, self)
       end
       
       def debug(message)
@@ -55,13 +69,17 @@ module Dronejob
       end
       
       def error(message)
-        if Exception === message
-          if log_stdout?
-            log(:error, "#{COLOR_RED_BG}#{COLOR_BOLD}#{COLOR_WHITE} ERROR #{COLOR_END} #{COLOR_BOLD}#{message.class}: #{COLOR_RED}#{message.message}#{COLOR_END}")
+        if message.kind_of?(StandardError)
+          if option(:dronejob_log) == "google"
+            log(:error, "#{message.backtrace.first}: #{message.message} (#{message.class})\n\t#{message.backtrace.drop(1).join("\n\t")}")
           else
-            log(:error, "[ERROR] #{message.class}: #{message.message}")
+            if log_stdout?
+              log(:error, "#{COLOR_RED_BG}#{COLOR_BOLD}#{COLOR_WHITE} ERROR #{COLOR_END} #{COLOR_BOLD}#{message.class}: #{COLOR_RED}#{message.message}#{COLOR_END}")
+            else
+              log(:error, "[ERROR] #{message.class}: #{message.message}")
+            end
+            backtrace(message.backtrace)
           end
-          backtrace(message.backtrace)
         else
           log(:error, message)
         end
@@ -95,7 +113,47 @@ module Dronejob
       
       def emergency(message)
         log(:emergency, message)
-      end   
+      end
+      
+      ActiveSupport.on_load :active_job do
+        class ActiveJob::Logging::LogSubscriber
+          def enqueue(event)
+            info do
+              job = event.payload[:job]
+              log_object("queueing #{job.class.name}", job)
+            end
+          end
+
+          def enqueue_at(event)
+            info do
+              job = event.payload[:job]
+              log_object("scheduling #{job.class.name}", job)
+            end
+          end
+
+          def perform_start(event)
+            info do
+              job = event.payload[:job]
+              log_object("starting #{job.class.name}", job)
+            end
+          end
+
+          def perform(event)
+            info do
+              job = event.payload[:job]
+              log_object("finishing #{job.class.name}", job)
+            end
+          end
+          
+          def log_object(message, job)
+            if job.option(:dronejob_log) == "google"
+              { message: "[#{job.job_id}] #{message}", job_id: job.job_id, queue: job.queue_name, phase: job.phase }
+            else
+              message
+            end
+          end
+        end
+      end
       
       private
       

data/lib/dronejob/modules/phases.rb

@@ -5,7 +5,7 @@ module Dronejob
       include ActiveSupport::Callbacks
 
       included do
-        attr_accessor :phase
+        attr_accessor :phase, :phase_config
         set_callback(:phase, :around){|r, block| logger.tagged(@phase, &block)}
       end
 

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/lib/dronejob.rb

@@ -1,3 +1,4 @@
+require "google/cloud/logging"
 require "active_support"
 require 'active_support/rails'
 require "dronejob/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,14 +176,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: DroneJob Drone Factory