dronejob 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88b29b5d14a2265c6995aadc9b1311a60ec75b1
-  data.tar.gz: 098e871db099aac491e1597aa291f725426f2bd6
+  metadata.gz: 6cae818f5050ff58791380e627c546e63efdddca
+  data.tar.gz: 1131b202e4e2edf76fecfd6367003bc93d85baac
 SHA512:
-  metadata.gz: d2e247b70efef090e89a2772360ef4acb56cb0c8a6ea1d2d504ef9af61446850bbc7e2b2ae275dc92b3726f7c2bf89c0202914e9598f65d40eea4ab625457d0f
-  data.tar.gz: 06a0097b2444fa76547a11f2f511ef3a23f9672f706dec4518c5ed4b35fae32308eef4e50fc87edfb4a1de67308ee952ff5ca15af9bf67d588bcbd97859ca689
+  metadata.gz: e0c6d490e93388f63e4bf6a19e3ff87d5f711408b12902554f8a5deecb3e4bbdaeb9cf28b8e874e9ffab8c8355e71bd3886612b7c5e1dbca21a95b5d158d1b9d
+  data.tar.gz: 24e8e35a177f6130e02f5acefde34bfb96e530246cb25880e7d679c4ae65ce25462ceebe78862747ce877e1253603fdcb4cd7f5d596b2f752c300846cd84e1bf

data/.gitignore

@@ -1,3 +1,3 @@
 /*.gem
-jobs/*
-workers/*
+app/*
+tmp/*

data/Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem "gcloud", github: "GoogleCloudPlatform/gcloud-ruby", branch: "master"
+gem "gcloud", github: "GoogleCloudPlatform/gcloud-ruby", branch: "master"

data/Gemfile.lock

@@ -13,14 +13,11 @@ GIT
 PATH
   remote: .
   specs:
-    dronejob (1.0.1)
+    dronejob (1.0.2)
       activejob (~> 4.2)
       bundler (~> 1.11)
       gcloud (~> 0.6)
       git (~> 1.2)
-      google-api-client (~> 0.8)
-      logging (~> 2.0)
-      logging-google-cloud (~> 1.0)
       rake (~> 10.5)
       thor (~> 0.19)
 
@@ -79,9 +76,6 @@ GEM
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    logging-google-cloud (1.0.2)
-      gcloud (~> 0.6)
-      logging (~> 2.0)
     memoist (0.14.0)
     method_source (0.8.2)
     mime-types (2.99)

data/README.md

@@ -6,4 +6,23 @@ Scalable worker factory for ruby
 
 Install gems:
 
-    $ bundle install
+	$ gem install dronejob
+
+## Usage
+
+
+### Logging
+
+
+```ruby
+# Create stdout logger
+require "logging"
+Logging.color_scheme("bright", levels: { debug: :blue, info: :green, warn: :yellow, error: :red, fatal: [:white, :on_red] }, date: :blue, ndc: :blue, logger: :cyan, message: :black)
+Dronejob::Base.logger = Logging::Logger.new("Dronejob").add_appenders(Logging::Appenders::Stdout.new("stdout", {layout: Logging.layouts.pattern({pattern: '[%d] %-5l %c{1} %x %m\n', color_scheme: 'bright'})}))
+	
+# Create gcl logger
+require "logging"
+require "logging/appenders/gcl"
+Logging.init(Logging::Appenders::GoogleCloudLogging::SEVERITY_NAMES)
+Dronejob::Base.logger = Logging::Logger.new("Dronejob").add_appenders(Logging::Appenders::GoogleCloudLogging.new("gcl", {project_id: "project-id", log_name: "dronejob", resource_type: "gce_instance", resource_labels: {instance_id: "instance-id", zone: "us-central1-b"}, buffer_size: '3', immediate_at: 'error, fatal'}))
+```

data/bin/dronejob

@@ -1,17 +1,7 @@
 #!/usr/bin/env ruby
 $:.push("lib/")
-# require "pry"
 require "thor"
 
-# initialize activejob
-require "dronejob"
-require "active_job"
-require "active_job/queue_adapters/pub_sub_queue_adapter"
-ActiveJob::Base.queue_adapter = :pub_sub_queue
-ActiveJob::Base.logger = Dronejob::Logger.logger
-
 # initialize dronejob
-Dronejob::Loader.init
-
 require "dronejob/command"
 Dronejob::Command.start

data/dronejob.gemspec

@@ -17,12 +17,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "bundler", "~> 1.11"
   s.add_runtime_dependency "rake", "~> 10.5"
   s.add_runtime_dependency "git", "~> 1.2"
-  s.add_runtime_dependency "logging", "~> 2.0"
   s.add_runtime_dependency "thor", "~> 0.19"
   s.add_runtime_dependency "activejob", "~> 4.2"
-  s.add_runtime_dependency "logging-google-cloud", "~> 1.0"
   s.add_runtime_dependency "gcloud", "~> 0.6"
-  s.add_runtime_dependency "google-api-client", "~> 0.8"
   s.add_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"
   s.files        = `git ls-files`.split("\n")

data/lib/active_job/queue_adapters/dronejob_queue_adapter.rb

@@ -0,0 +1,19 @@
+require "gcloud"
+module ActiveJob
+  module QueueAdapters
+    class DronejobQueueAdapter
+      class << self
+        
+        def enqueue(job)
+          Dronejob::Base.log("info", "Enqueuing worker #{job.class.name} with job id #{job.job_id}")
+          Dronejob::Base.publish_job(job)
+        end
+      
+        def enqueue_at(*)
+          raise NotImplementedError.new("Delayed execution is not supported on Google Cloud Pub Sub.")
+        end
+        
+      end
+    end
+  end
+end

data/lib/dronejob/base.rb

@@ -1,9 +1,11 @@
+require "active_job"
 require 'dronejob/modules/attr_store'
 require 'dronejob/modules/core'
 require 'dronejob/modules/git'
 require 'dronejob/modules/log'
 require 'dronejob/modules/params'
 require 'dronejob/modules/phases'
+require 'dronejob/modules/pub_sub'
 require 'dronejob/modules/workspace'
 
 module Dronejob
@@ -14,6 +16,7 @@ module Dronejob
     include Modules::Log
     include Modules::Params
     include Modules::Phases
+    include Modules::PubSub
     include Modules::Workspace
     
     ActiveSupport.run_load_hooks(:dronejob, self)

data/lib/dronejob/command.rb

@@ -1,3 +1,5 @@
+require "dronejob"
+require "active_job"
 module Dronejob
   class Command < Thor
     
@@ -6,8 +8,9 @@ module Dronejob
       
       # Pub/Sub options
       method_option(:project_id, type: :string, required: true)
-      method_option(:queue_topic, type: :string, required: true, default: "dronejob_queue")
-      method_option(:status_topic, type: :string, required: true, default: "dronejob_status")
+      method_option(:queue_topic, type: :string, required: false)
+      method_option(:status_topic, type: :string, required: false)
+      method_option(:queue_adapter, type: :string, default: "dronejob_queue")
       
       # Worker options
       method_option(:run, aliases: "-r", type: :boolean, default: false)
@@ -15,6 +18,9 @@ module Dronejob
       method_option(:skip, aliases: "-s", type: :array, default: [])
       method_option(:from, aliases: "-f", type: :string)
       method_option(:listen, aliases: "-l", type: :boolean, default: false)
+      method_option(:notify, aliases: "-n", type: :boolean, default: true)
+      method_option(:jobs_path, type: :string)
+      method_option(:output_path, type: :string)
       
       # Worker options
       worker.params.each do |key, config|
@@ -22,22 +28,33 @@ module Dronejob
       end
       
       define_method(identifier) do
-        # Set up adapter
-        ActiveJob::QueueAdapters::PubSubQueueAdapter.project_id = options.project_id
-        ActiveJob::QueueAdapters::PubSubQueueAdapter.queue_topic = options.queue_topic
-        ActiveJob::QueueAdapters::PubSubQueueAdapter.status_topic = options.status_topic
+        ActiveJob::Base.queue_adapter = options.queue_adapter
+        Dronejob::Base.project_id = options.project_id
+        Dronejob::Base.queue_topic = options.queue_topic if options.queue_topic
+        Dronejob::Base.status_topic = options.status_topic if options.status_topic
+        Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
+        Dronejob::Base.output_path = options.output_path if options.output_path
         
         # Execute / queue job
         if options.run
-          worker.perform_now(options.to_hash)
+          worker.perform_now(options)
         else
           job = worker.perform_later(options.to_hash)
           
           # Listen for notifications
           if options.listen
-            ActiveJob::QueueAdapters::PubSubQueueAdapter.listen(job) do |detail|
-              Dronejob::Logger.log("info", "status: #{detail.to_json}")
-              abort if detail["phase"] == "complete"
+            if options.run or !options.notify
+              Dronejob::Base.log("error", "Unable to listen to a jobs that '--run' instantly, or with '--no-notify' set")
+            else
+              Dronejob::Base.subscribe(Dronejob::Base.status_topic, true) do |data|
+                if data["job_id"] == job.job_id
+                  Dronejob::Base.log("info", "status: #{data["detail"].to_json}")
+                  if data["detail"]["phase"] == "complete"
+                    Dronejob::Base.log("info", "job completed")
+                    Kernel.exit
+                  end
+                end
+              end
             end
           end
           
@@ -46,17 +63,23 @@ module Dronejob
     end
     
     desc :server, "Start Dronejob Server"
+    method_option(:queue_adapter, type: :string, default: "dronejob_queue", enum: ["dronejob_queue"])
     method_option(:project_id, type: :string, required: true)
-    method_option(:queue_topic, type: :string, required: true, default: "dronejob_queue")
-    method_option(:status_topic, type: :string, required: true, default: "dronejob_status")
+    method_option(:queue_topic, type: :string, required: false)
+    method_option(:status_topic, type: :string, required: false)
+    method_option(:jobs_path, type: :string)
+    method_option(:output_path, type: :string)
     def server
-      # Set up adapter
-      ActiveJob::QueueAdapters::PubSubQueueAdapter.project_id = options.project_id
-      ActiveJob::QueueAdapters::PubSubQueueAdapter.queue_topic = options.queue_topic
-      ActiveJob::QueueAdapters::PubSubQueueAdapter.status_topic = options.status_topic
+      ActiveJob::Base.queue_adapter = options.queue_adapter
+      Dronejob::Base.project_id = options.project_id
+      Dronejob::Base.queue_topic = options.queue_topic if options.queue_topic
+      Dronejob::Base.status_topic = options.status_topic if options.status_topic
+      Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
+      Dronejob::Base.output_path = options.output_path if options.output_path
       
       # Run worker
-      ActiveJob::QueueAdapters::PubSubQueueAdapter.run_worker!
+      Dronejob::Base.log("info", "Subscribing to topic #{Dronejob::Base.queue_topic} in project #{Dronejob::Base.project_id}")
+      Dronejob::Base.run_worker!
     end
     
   end

data/lib/dronejob/loader.rb

@@ -1,16 +1,18 @@
 module Dronejob
   module Loader
-    @@workers = {}
+    @@workers = nil
 
-    def self.init(path="workers")
+    def self.load
       require "active_support/all"
-      Dir["#{path}/*.rb"].each do |file|
+      workers = {}
+      Dir["#{Dronejob::Base.jobs_path}/*.rb"].each do |file|
         require "./#{file}"
         identifier = File.basename(file).gsub(/\.rb$/, "")
-        klassname = "Workers::#{identifier.camelcase}"
+        klassname = identifier.camelcase
         klass = klassname.constantize
-        @@workers[identifier] = klass
+        workers[identifier] = klass
       end
+      workers
     end
     
     def self.identifier_for(worker)
@@ -18,7 +20,7 @@ module Dronejob
     end
     
     def self.workers
-      @@workers
+      @@workers ||= load
     end
   end
 end

data/lib/dronejob/modules/attr_store.rb

@@ -16,7 +16,7 @@ module Dronejob
         end
 
         def attr_stores
-          @attr_stores
+          @attr_stores ||= []
         end
       end
       

data/lib/dronejob/modules/core.rb

@@ -19,23 +19,19 @@ module Dronejob
           begin
             phase_result = public_send(phase)
           rescue Exception => e
-            error!(e)
+            error(e)
           end
-          notify(phase_result) if config[:notify]
+          publish_status(phase_result) if config[:notify]
           git_commit(phase)
         end
         @phase = "complete"
-        notify(true)
+        publish_status(true) if param(:notify) and !param(:run)
       end
       
       def uuid
         @uuid ||= "#{self.class.name.split('::').last.underscore}_#{SecureRandom.uuid}"
       end
       
-      def notify(result=nil)
-        ActiveJob::QueueAdapters::PubSubQueueAdapter.notify(self, {phase: @phase, result: result})
-      end
-      
       def shell
         @shell ||= Thor::Shell::Color.new
       end

data/lib/dronejob/modules/git.rb

@@ -46,9 +46,9 @@ module Dronejob
       
       def git_reset(commit=nil)
         if commit
-          log("resetting to phase '#{commit}'")
+          info("resetting to phase '#{commit}'")
           from_index = @commits.keys.index(commit)
-          error!("phase '#{commit}' not found!") if from_index.nil? or !@commits.keys[from_index]
+          error("phase '#{commit}' not found!") if from_index.nil? or !@commits.keys[from_index]
           previous = @commits.keys[from_index]
           @git.reset_hard(@commits[previous])
         else

data/lib/dronejob/modules/log.rb

@@ -1,22 +1,59 @@
+require 'active_support/tagged_logging'
+require 'active_support/logger'
 module Dronejob
   module Modules
     module Log
       extend ActiveSupport::Concern
-
-      def log(message, level=:info)
-        begin
-          Dronejob::Logger.log(level, message)
-        rescue Exception => e
-          puts "LOGGING ERROR: #{e}"
-          e.backtrace.each do |line|
-            puts("▸ #{line}")
+      
+      included do
+        cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
+      end
+      
+      module ClassMethods
+        
+        def log(level, message, phase=:global)
+          if !logger.nil?
+            logger.send(level, message)
+          else
+            puts "#{level}: [#{phase}] #{message}"
           end
-          abort "EXIT"
         end
       end
       
-      def error!(message)
-        log(message, level=:error)
+      def log(level, message)
+        self.class.log(level, message, @phase)
+      end
+      
+      def debug(message)
+        log(:debug, message)
+      end
+      
+      def info(message)
+        log(:info, message)
+      end
+      
+      def notice(message)
+        log(:notice, message)
+      end
+      
+      def warning(message)
+        log(:warning, message)
+      end
+      
+      def error(message)
+        log(:error, message)
+      end
+      
+      def critical(message)
+        log(:critical, message)
+      end
+      
+      def alert(message)
+        log(:alert, message)
+      end
+      
+      def emergency(message)
+        log(:emergency, message)
       end
       
     end

data/lib/dronejob/modules/params.rb

@@ -10,11 +10,12 @@ module Dronejob
         end
       
         def params
-          @params
+          @params ||= {}
         end
       end
       
       def param(key)
+        @params ||= {}
         @params[key.to_s]
       end
       

data/lib/dronejob/modules/phases.rb

@@ -23,15 +23,17 @@ module Dronejob
           fail "Phase not found: '#{phase}'" unless self.respond_to?(phase)
           @phase = phase
           before_phase(phase, config) if self.respond_to?(:before_phase)
-          Logging.ndc.push("#{uuid}##{phase}")
-          if completed_phase?(phase) and !config[:always_run]
-            log("already completed")
-          elsif skip_phase?(phase)
-            log("skipping...")
-          else
-            block.call(phase, config)
+          
+          logger.tagged(phase) do
+            if completed_phase?(phase) and !config[:always_run]
+              info("already completed")
+            elsif skip_phase?(phase)
+              info("skipping...")
+            else
+              block.call(phase, config)
+            end
           end
-          Logging.ndc.pop
+          
           after_phase(phase, config) if self.respond_to?(:after_phase)
         end
       end

data/lib/dronejob/modules/pub_sub.rb

@@ -0,0 +1,60 @@
+require "gcloud"
+
+module Dronejob
+  module Modules
+    module PubSub
+      extend ActiveSupport::Concern
+      
+      included do
+        cattr_accessor(:project_id) { "default" }
+        cattr_accessor(:queue_topic) { "dronejob_queue" }
+        cattr_accessor(:status_topic) { "dronejob_status" }
+      end
+      
+      module ClassMethods
+        
+        def pubsub
+          @pubsub ||= Gcloud.new(project_id).pubsub
+        end
+        
+        def publish_job(job)
+          publish(queue_topic, job.serialize)
+        end
+        
+        def publish_status(job, detail)
+          publish(status_topic, {job_id: job.job_id, detail: detail})
+        end
+        
+        def publish(topic_name, data)
+          topic = pubsub.topic(topic_name)
+          topic.publish(data.to_json)
+        end
+        
+        def run_worker!
+          subscribe(queue_topic, true) do |data|
+            begin
+              ActiveJob::Base.deserialize(data).perform_now()
+            rescue Exception => e
+              log("error", e)
+            end
+          end
+        end
+        
+        def subscribe(topic_name, autoack=true, &block)
+          topic = pubsub.topic(topic_name)
+          subscription = topic.subscription(topic_name)
+          topic.subscribe(topic_name) if subscription.nil? or !subscription.exists?
+          subscription.listen autoack: autoack do |message|
+            block.call(JSON.parse(message.data))
+          end
+        end
+        
+      end
+      
+      def publish_status(result=nil)
+        self.class.publish_status(self, {phase: @phase, result: result})
+      end
+      
+    end
+  end
+end

data/lib/dronejob/modules/workspace.rb

@@ -5,10 +5,12 @@ module Dronejob
 
       included do
         attr_accessor :working_dir
+        cattr_accessor(:jobs_path) { "app/jobs" }
+        cattr_accessor(:output_path) { "tmp/jobs" }
       end
 
-      def create_working_dir()
-        @working_dir = File.join("jobs", uuid)
+      def create_working_dir
+        @working_dir = File.join(self.class.output_path, uuid)
         FileUtils.mkdir_p(@working_dir)
       end
       

data/lib/dronejob/railtie.rb

@@ -0,0 +1,26 @@
+require 'global_id/railtie'
+require 'dronejob'
+
+module Dronejob
+  # = Dronejob Railtie
+  class Railtie < Rails::Railtie
+    config.dronejob = ActiveSupport::OrderedOptions.new
+
+    initializer 'dronejob.logger' do
+      ActiveSupport.on_load(:dronejob) { self.logger = ::Rails.logger }
+    end
+
+    initializer "dronejob.set_configs" do |app|
+      options = app.config.dronejob
+
+      ActiveSupport.on_load(:dronejob) do
+        options.each { |k,v| send("#{k}=", v) }
+      end
+    end
+    
+    rake_tasks do
+      load "dronejob/railties/dronejob.rake"
+    end
+
+  end
+end

data/lib/dronejob/railties/dronejob.rake

@@ -0,0 +1,6 @@
+namespace :dronejob do
+  task :server => :environment do
+    Dronejob::Base.log("info", "Subscribing to topic #{Dronejob::Base.queue_topic} in project #{Dronejob::Base.project_id}")
+    Dronejob::Base.run_worker!
+  end
+end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/dronejob.rb

@@ -1,9 +1,12 @@
 require "active_support"
+require 'active_support/rails'
+require "active_job/queue_adapters/dronejob_queue_adapter"
 require "dronejob/version"
 
+require 'dronejob/railtie' if defined?(Rails)
+
 module Dronejob
   extend ActiveSupport::Autoload
   autoload :Base
   autoload :Loader
-  autoload :Logger
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: logging-google-cloud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: gcloud
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: google-api-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,19 +136,21 @@ files:
 - README.md
 - bin/dronejob
 - dronejob.gemspec
-- lib/active_job/queue_adapters/pub_sub_queue_adapter.rb
+- lib/active_job/queue_adapters/dronejob_queue_adapter.rb
 - lib/dronejob.rb
 - lib/dronejob/base.rb
 - lib/dronejob/command.rb
 - lib/dronejob/loader.rb
-- lib/dronejob/logger.rb
 - lib/dronejob/modules/attr_store.rb
 - lib/dronejob/modules/core.rb
 - lib/dronejob/modules/git.rb
 - lib/dronejob/modules/log.rb
 - lib/dronejob/modules/params.rb
 - lib/dronejob/modules/phases.rb
+- lib/dronejob/modules/pub_sub.rb
 - lib/dronejob/modules/workspace.rb
+- lib/dronejob/railtie.rb
+- lib/dronejob/railties/dronejob.rake
 - lib/dronejob/version.rb
 homepage: https://github.com/MagLoft/dronejob
 licenses:

data/lib/active_job/queue_adapters/pub_sub_queue_adapter.rb

@@ -1,76 +0,0 @@
-module ActiveJob
-  module QueueAdapters
-    class PubSubQueueAdapter
-      
-      def self.project_id
-        @@project_id
-      end
-      
-      def self.project_id=(project_id)
-        @@project_id = project_id
-      end
-      
-      def self.queue_topic
-        @@queue_topic ||= "dronejob_queue"
-      end
-      
-      def self.queue_topic=(queue_topic)
-        @@queue_topic = queue_topic
-      end
-      
-      def self.status_topic
-        @@status_topic ||= "dronejob_status"
-      end
-      
-      def self.status_topic=(status_topic)
-        @@status_topic = status_topic
-      end
-            
-      def self.pubsub
-        gcloud = Gcloud.new(self.project_id)
-        gcloud.pubsub
-      end
-
-      def self.enqueue(job)
-        Dronejob::Logger.log("info", "Enqueuing worker #{job.class.name} with job id #{job.job_id}")
-        topic = pubsub.topic(self.queue_topic)
-        topic.publish(job.serialize.to_json)
-      end
-      
-      def self.listen(job, &block)
-        subscribe(self.status_topic, true) do |data|
-          block.call(data["detail"]) if data["job_id"] == job.job_id
-        end
-      end
-
-      def self.run_worker!
-        subscribe(self.queue_topic, true) do |data|
-          job = ActiveJob::Base.deserialize(data)
-          Dronejob::Logger.log("info", "Processing worker #{job.class.name} with job id #{job.job_id}")
-          job.perform_now()
-        end
-      end
-      
-      def self.notify(job, detail)
-        topic = pubsub.topic(self.status_topic)
-        data = {job_id: job.job_id, detail: detail}
-        topic.publish(data.to_json)
-      end
-      
-      private
-      
-        def self.subscribe(topic_name, autoack=true, &block)
-          Dronejob::Logger.log("info", "Preparing subscription to #{topic_name}")
-          topic = pubsub.topic(topic_name)
-          subscription = topic.subscription(topic_name)
-          topic.subscribe(topic_name) if subscription.nil? or !subscription.exists?
-          Dronejob::Logger.log("info", "Subscribing to #{topic}")
-          subscription.listen autoack: autoack do |message|
-            data = JSON.parse(message.data)
-            block.call(data)
-          end
-        end
-      
-    end
-  end
-end

data/lib/dronejob/logger.rb

@@ -1,25 +0,0 @@
-require "logging"
-require "logging/appenders/gcl"
-
-module Dronejob
-  module Logger
-    @@logger = nil
-
-    def self.logger
-      if @@logger.nil?
-        Logging.init(Logging::Appenders::GoogleCloudLogging::SEVERITY_NAMES)
-        Logging.color_scheme("bright", levels: { debug: :blue, info: :green, warn: :yellow, error: :red, fatal: [:white, :on_red] }, date: :blue, ndc: :blue, logger: :cyan, message: :black)
-        Logging.appenders.stdout("stdout", layout: Logging.layouts.pattern( pattern: '[%d] %-5l %c{1} %x %m\n', color_scheme: 'bright'))
-        Logging.appenders.gcl("gcl", project_id: "typeshot-01", log_name: "dronejob", resource_type: "gce_instance", resource_labels: {instance_id: "drone-05", zone: "us-central1-b"}, buffer_size: '3', immediate_at: 'error, fatal')
-        @@logger = Logging::Logger.new("Dronejob")
-        @@logger.add_appenders("stdout") # gcl
-      end
-      @@logger
-    end
-    
-    def self.log(level, message)
-      logger.send(level, message)
-    end
-    
-  end
-end