asyncapi-client 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f87f6926b827e5fd13e149f5c8be271bc403b70b
-  data.tar.gz: b069c2ad36fd138d81749e5043bf759b622f7cae
+  metadata.gz: bb359e773a03ebfdcf520583dd45c19dd8fdbc53
+  data.tar.gz: aacd73eb3244465fa8d68b37ca784ff994e56fc0
 SHA512:
-  metadata.gz: 95f6229083351515c521543934569a93e2b6c83c92f2237d9ca47d382b76fc210532932796e40478b4bedebb7932f4774303a8834a0f0d0ff2f6df8151698903
-  data.tar.gz: 79dd9e24681b251dd0bc34c266a4faf2dea526be886c734952ec1f444555c0f4ca6f5baf6e5350e73369af63950e847983a3d0e9873364e446d6f24843c03161
+  metadata.gz: eb344d71daa7c95cb318da4280b051a2f84c93caa2d17a1935df78b62e54f0e6625068cf8aa99eceacd898900151d152a118ad236f4df3cb77eef13f62669ad3
+  data.tar.gz: b7b6fea653dacf7bc0b936ad098a6e49ce98b30ffa6e7328e8ac78b7bc1684b9b025f8eb6ea2377695c60c2c4501ab706939faa9166e1f653e36c82a9eb3fd44

data/app/workers/asyncapi/client/cleaner_worker.rb

@@ -6,9 +6,7 @@ module Asyncapi
       sidekiq_options retry: false
 
       def perform
-        Job.expired.find_each do |job|
-          JobCleanerWorker.perform_async(job.id)
-        end
+        Job.expired.pluck(:id).each{ |job_id| JobCleanerWorker.perform_async(job_id) }
       end
 
     end

data/app/workers/asyncapi/client/job_cleaner_worker.rb

@@ -7,7 +7,7 @@ module Asyncapi
 
       def perform(job_id)
         if job = Job.find_by(id: job_id)
-          destroy_remote job
+          destroy_remote(job)
           job.destroy
         end
       end
@@ -15,12 +15,46 @@ module Asyncapi
       private
 
       def destroy_remote(job)
-        Typhoeus.delete(job.server_job_url, {
-          params: { secret: job.secret },
-          headers: job.headers,
-        })
+        errors = validate_remote_job_info(job)
+        if errors.empty?
+          Typhoeus.delete(job.server_job_url, {
+            params: { secret: job.secret },
+            headers: job.headers,
+          })
+        else
+          log_remote_error_for(job, errors)
+        end
+      end
+
+      def validate_remote_job_info(job)
+        errors = []
+        errors << "server_job_url is invalid"         unless url_ok_for?(job)
+        errors << "authorization headers are not present" unless headers_ok_for?(job)
+        errors << "secret is not present"                unless job.secret.present?
+        errors
+      end
+
+      def url_ok_for?(job)
+        uri = URI.parse(job.server_job_url)
+        uri.is_a?(URI::HTTP) && !uri.host.nil?
+      rescue URI::InvalidURIError
+        false
       end
 
+      def headers_ok_for?(job)
+        job.headers.is_a?(Hash) && job.headers[:AUTHORIZATION]
+      end
+
+      def log_remote_error_for(job, errors)
+        if defined?(G5::Logger::Log)
+          G5::Logger::Log.send(:warn, {
+            origin: "#{self.class.name}#destroy_remote",
+            external_parent_id: "#{job.id}",
+            message: "Not enough info to delete expired remote job: #{errors.join(", ")}",
+            error: "Unable to delete remote job",
+          })
+        end
+      end
     end
   end
 end

data/db/migrate/20141104030959_create_asyncapi_client_jobs.rb

@@ -1,4 +1,4 @@
-class CreateAsyncapiClientJobs < ActiveRecord::Migration
+class CreateAsyncapiClientJobs < ActiveRecord::Migration[4.2]
   def change
     create_table :asyncapi_client_jobs do |t|
       t.string   "server_job_url"

data/db/migrate/20141119011011_add_callback_params_to_asyncapi_client_jobs.rb

@@ -1,4 +1,4 @@
-class AddCallbackParamsToAsyncapiClientJobs < ActiveRecord::Migration
+class AddCallbackParamsToAsyncapiClientJobs < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :callback_params, :text
   end

data/db/migrate/20141212064041_add_secret_to_asyncapi_client_job.rb

@@ -1,4 +1,4 @@
-class AddSecretToAsyncapiClientJob < ActiveRecord::Migration
+class AddSecretToAsyncapiClientJob < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :secret, :string
   end

data/db/migrate/20150202062211_add_expired_at_to_asyncapi_client_job.rb

@@ -1,4 +1,4 @@
-class AddExpiredAtToAsyncapiClientJob < ActiveRecord::Migration
+class AddExpiredAtToAsyncapiClientJob < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :expired_at, :datetime
   end

data/db/migrate/20150202062320_populate_asyncapi_client_job_expired_at.rb

@@ -1,4 +1,4 @@
-class PopulateAsyncapiClientJobExpiredAt < ActiveRecord::Migration
+class PopulateAsyncapiClientJobExpiredAt < ActiveRecord::Migration[4.2]
   def change
     Asyncapi::Client::Job.find_each do |job|
       job.update_attributes(expired_at: Asyncapi::Client.expiry_threshold.from_now)

data/db/migrate/20150610053320_add_on_time_out_to_asyncapi_client_job.rb

@@ -1,4 +1,4 @@
-class AddOnTimeOutToAsyncapiClientJob < ActiveRecord::Migration
+class AddOnTimeOutToAsyncapiClientJob < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :on_time_out, :string
   end

data/db/migrate/20150612082965_add_time_out_index_to_asyncapi_client_job.rb

@@ -1,4 +1,4 @@
-class AddTimeOutIndexToAsyncapiClientJob < ActiveRecord::Migration
+class AddTimeOutIndexToAsyncapiClientJob < ActiveRecord::Migration[4.2]
   def change
     add_index :asyncapi_client_jobs, :time_out_at
   end

data/db/migrate/20150630004215_add_response_code_to_asyncapi_client_jobs.rb

@@ -1,4 +1,4 @@
-class AddResponseCodeToAsyncapiClientJobs < ActiveRecord::Migration
+class AddResponseCodeToAsyncapiClientJobs < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :response_code, :integer
   end

data/db/migrate/20150703001225_add_on_queue_error_to_asyncapi_client_jobs.rb

@@ -1,4 +1,4 @@
-class AddOnQueueErrorToAsyncapiClientJobs < ActiveRecord::Migration
+class AddOnQueueErrorToAsyncapiClientJobs < ActiveRecord::Migration[4.2]
   def change
     add_column :asyncapi_client_jobs, :on_queue_error, :string
   end

data/db/migrate/20190218200630_add_expired_at_index_to_asyncapi_client_jobs.rb

@@ -0,0 +1,11 @@
+class AddExpiredAtIndexToAsyncapiClientJobs < ActiveRecord::Migration[5.0]
+  disable_ddl_transaction!
+
+  def change
+    opts = {}
+    if !!(ActiveRecord::Base.connection_config[:adapter] =~ /postgresql/i)
+      opts[:algorithm] = :concurrently
+    end
+    add_index :asyncapi_client_jobs, :expired_at, opts
+  end
+end

data/lib/asyncapi/client/version.rb

@@ -1,5 +1,5 @@
 module Asyncapi
   module Client
-    VERSION = "0.7.0"
+    VERSION = "0.8.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asyncapi-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,16 +128,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,7 @@ files:
 - db/migrate/20150612082965_add_time_out_index_to_asyncapi_client_job.rb
 - db/migrate/20150630004215_add_response_code_to_asyncapi_client_jobs.rb
 - db/migrate/20150703001225_add_on_queue_error_to_asyncapi_client_jobs.rb
+- db/migrate/20190218200630_add_expired_at_index_to_asyncapi_client_jobs.rb
 - lib/asyncapi-client.rb
 - lib/asyncapi/client.rb
 - lib/asyncapi/client/engine.rb