zuora_connect 1.7.08 → 1.7.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f73ba41b420d1b552236557a910cadb74a0f29
-  data.tar.gz: a32115c1a42f2774bbb030eeacc5480f0afcc0f4
+  metadata.gz: 84f674e406438075bbef02a62232b69cfb9c0105
+  data.tar.gz: 9a09ec79a527c28ede8ef3fcd18c6b308bcec58d
 SHA512:
-  metadata.gz: e65354cd51cfa0a818a9979a45b217d2535131b1739e15753882db63340f106ec582dc023e865221985746f99b16c725f203b1cdeb08942f6b3ae580d2a5e957
-  data.tar.gz: d7c556be08e52be64a65f3f9a9ceb9dd95c7a60790076b6de46dfedfe28132efce0d2b45d239c4b4d62da1a9212fd4615b9b095990e966429d37206c00f2a344
+  metadata.gz: d39a9ab1e17b478a341caa01c0c9784b61e3600e74e46996ab5161cd4c6c19e21068b06bb990496f140d6a1cf6fcba4772b1fba16e6c3049f87b7ff04d8f8b73
+  data.tar.gz: 15aaa257249ceeb2a34b17dd90dd142de8a6eb9bb5ed5891556e8174685c200710d8f37d999893647a316e51cec5e4cb0d6296420a0784327c3a7a96db1239c4

data/app/models/zuora_connect/telegraf.rb

@@ -29,7 +29,7 @@ module ZuoraConnect
         # To avoid writing metrics from rspec tests
         if Rails.env.to_sym != :test
           app_instance = Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0
-          tags = tags.merge({ app_name: app_name, process_type: process_type, app_instance: app_instance, pod_name: pod_name})
+          tags = { app_name: app_name, process_type: process_type, app_instance: app_instance, pod_name: pod_name}.merge(tags)
 
           if direction == :inbound
             self.write_udp(series: INBOUND_METRICS_NAME, tags: tags, values: values) if INBOUND_METRICS

data/config/initializers/unicorn.rb

@@ -3,7 +3,7 @@ if defined?(Unicorn::WorkerKiller)
     self.singleton_class.send(:alias_method, :kill_self_old, :kill_self)
     def self.kill_self(logger, start_time)
       self.kill_self_old(logger, start_time)
-      ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: { }, values: {kill: 1})
+      ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
     end
   end
 end

data/lib/middleware/metrics_middleware.rb

@@ -47,7 +47,7 @@ module Middleware
 
       # If the url contains any CSS or JavaScript files then do not collect metrics for them
       if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) } || /.*\.js$/.match(env['PATH_INFO'])
-        tags = {status: @status, controller: 'ActionController', action: 'Assets' }
+        tags = {status: @status, controller: 'ActionController', action: 'Assets', app_instance: 0}
         values = {response_time: ((Time.now - start_time)*1000).round(2) }
         ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
       end

data/lib/resque/silence_done.rb

@@ -1,6 +1,6 @@
 module Resque  
   module SilenceDone
-    def perform_no_finish_log(job)
+    def perform_no_log(job)
       begin
         if fork_per_job?
           reconnect
@@ -16,10 +16,55 @@ module Resque
       end
     end
 
+    # def work(interval = 5.0, &block)
+    #   interval = Float(interval)
+    #   startup
+
+    #   loop do
+    #     break if shutdown?
+
+    #     unless work_one_job(&block)
+    #       break if interval.zero?
+    #       log_with_severity :debug, "Sleeping for #{interval} seconds"
+    #       procline paused? ? "Paused" : "Waiting for #{queues.join(',')}"
+    #       sleep interval
+    #     end
+    #   end
+
+    #   unregister_worker
+    # rescue Exception => exception
+    #   return if exception.class == SystemExit && !@child && run_at_exit_hooks
+    #   log_with_severity :error, "Failed to start worker : #{exception.inspect}"
+    #   unregister_worker(exception)
+    # end
+
+    def work_one_job_no_log(job = nil, &block)
+      return false if paused?
+      return false unless job ||= reserve
+
+      working_on job
+      procline "Processing #{job.queue} since #{Time.now.to_i} [#{job.payload_class_name}]"
+
+      #log_with_severity :info, "got: #{job.inspect}"
+      job.worker = self
+
+      if fork_per_job?
+        perform_with_fork(job, &block)
+      else
+        perform(job, &block)
+      end
+
+      done_working
+      true
+    end
+
     def self.included(receiver)
       receiver.class_eval do
-        alias perform_with_finish_log perform
-        alias perform perform_no_finish_log
+        alias work_one_job_with_log work_one_job
+        alias work_one_job work_one_job_no_log
+
+        alias perform_with_log perform
+        alias perform perform_no_log
       end
     end
   end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.08"
+  VERSION = "1.7.09"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.08
+  version: 1.7.09
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment