zuora_connect 1.7.05 → 1.7.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a857c08845f7874d0e5993d6dcfd64b5f477a6b7
-  data.tar.gz: 9b44889f84667d06f12eac95a99b89ee32de995c
+  metadata.gz: 84140eabcf1113abd7eeec18aaaf1ec0997fecc0
+  data.tar.gz: 9d88deb7f485ecc9796baee006482e167d6961c0
 SHA512:
-  metadata.gz: 2d448ca83a052c5b045efb072642c7fa69290ced6ed63b83b4bce9d07821637f11eb1fea44cc9a2dc68093a9c5fd66e799ae09d2f92e14e5c7b2e189c16fd096
-  data.tar.gz: 45a84690808ea9b2fad8506f7a07360f05adde3dfc4f649b7070e4bfd941bc7b012b587291b7a55a4907c3cc8fc824b279b69041cfefc0126e0a11fe7e95e4e3
+  metadata.gz: baedce094c2dfdfd25977d6bbbee9f619ad1b239d73dfb0cafd1b1506273b30bb4bc75ce55ff5f073034eb15ca692ca682428ca371f26cbe87d8aee8afbb26a9
+  data.tar.gz: 5db8d831c7c50a0762d3b012499ee7d870720bb54e047521d9ca20c4dde4416688602df89d3140a94dd6779f222cdfcb569982923b823c19204bc5af8f8e491a

data/app/models/zuora_connect/app_instance_base.rb

@@ -469,20 +469,25 @@ module ZuoraConnect
       end
 
       def queue_paused?
-        return Redis.current.get("resque:PauseQueue:#{self.id}").to_bool
+        return Redis.current.get("resque:PauseQueue:#{self.id}").present?
       end
 
-      def queue_pause(time: nil)
+      def queue_pause(time: nil, current_user: 'Default')
         if time.present?
           raise "Time must be fixnum of seconds." if time.class != Fixnum
-          Redis.current.setex("resque:PauseQueue:#{self.id}", time, true)
+          Redis.current.setex("resque:PauseQueue:#{self.id}", time, current_user)
         else
-          Redis.current.set("resque:PauseQueue:#{self.id}", true)
+          Redis.current.set("resque:PauseQueue:#{self.id}", current_user)
         end
       end
 
-      def queue_start
-        Redis.current.del("resque:PauseQueue:#{self.id}")
+      def queue_start(current_user: 'Default')
+        paused_user = Redis.current.get("resque:PauseQueue:#{self.id}") 
+        if paused_user == current_user || paused_user.blank?
+          Redis.current.del("resque:PauseQueue:#{self.id}")
+        else
+          raise "Can only unpause for user #{user}." 
+        end
       end
     ### END Resque Helping Methods ####
 

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})
+          tags = tags.merge({ app_name: app_name, process_type: process_type, app_instance: app_instance, pod_name: pod_name})
 
           if direction == :inbound
             self.write_udp(series: INBOUND_METRICS_NAME, tags: tags, values: values) if INBOUND_METRICS
@@ -60,7 +60,11 @@ module ZuoraConnect
     end
 
     def app_name
-      return ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
+      return ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name
+    end
+
+    def pod_name
+      return ENV['HOSTNAME'].present? ? ENV['HOSTNAME'] : 'Unknown'
     end
 
     # Returns the process type if any

data/config/initializers/resque.rb

@@ -1,5 +1,6 @@
 if defined?(Resque::Worker)
   Resque.send(:extend, Resque::Additions)
   Resque::Worker.send(:include, Resque::DynamicQueues)
+  Resque::Worker.send(:include, Resque::SilenceDone) if ZuoraConnect.configuration.silencer_resque_finish == true
   Resque::Job.send(:include, Resque::SelfLookup)
 end

data/config/initializers/unicorn.rb

@@ -0,0 +1,9 @@
+if defined?(Unicorn::WorkerKiller)
+  Unicorn::WorkerKiller.module_eval do
+    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})
+    end
+  end
+end

data/lib/middleware/metrics_middleware.rb

@@ -46,7 +46,11 @@ module Middleware
       @status, @headers, @response = @app.call(env)
 
       # If the url contains any CSS or JavaScript files then do not collect metrics for them
-      return [@status, @headers, @response] if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) }
+      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' }
+        values = {response_time: ((Time.now - start_time)*1000).round(2) }
+        ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
+      end
 
       if defined? Prometheus
         #Prometheus Stuff

data/lib/resque/silence_done.rb

@@ -0,0 +1,26 @@
+module Resque  
+  module SilenceDone
+    def perform_no_finish_log(job)
+      begin
+        if fork_per_job?
+          reconnect
+          run_hook :after_fork, job
+        end
+        job.perform
+      rescue Object => e
+        report_failed_job(job,e)
+      else
+        # log_with_severity :info, "done: #{job.inspect}"
+      ensure
+        yield job if block_given?
+      end
+    end
+
+    def self.included(receiver)
+      receiver.class_eval do
+        alias perform_with_finish_log perform
+        alias perform perform_no_finish_log
+      end
+    end
+  end
+end

data/lib/zuora_connect.rb

@@ -6,6 +6,7 @@ require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
 require 'resque/additions'
 require 'resque/dynamic_queues'
+require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'metrics/influx/point_value'
 require 'metrics/net'

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block
+    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -17,8 +17,8 @@ module ZuoraConnect
       @delayed_job = false
       @private_key = ENV["CONNECT_KEY"]
       @additional_apartment_models = []
+      @silencer_resque_finish = true
       
-
       # Setting the app name for telegraf write
       @enable_metrics = false
       @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.05"
+  VERSION = "1.7.06"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.05
+  version: 1.7.06
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -272,6 +272,7 @@ files:
 - config/initializers/redis.rb
 - config/initializers/resque.rb
 - config/initializers/to_bool.rb
+- config/initializers/unicorn.rb
 - config/routes.rb
 - db/migrate/20100718151733_create_connect_app_instances.rb
 - db/migrate/20101024162319_add_tokens_to_app_instance.rb
@@ -289,6 +290,7 @@ files:
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/self_lookup.rb
+- lib/resque/silence_done.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb
@@ -363,44 +365,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/integration/navigation_test.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/models/zuora_connect/app_instance_test.rb
+- test/test_helper.rb
 - test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
+- test/integration/navigation_test.rb
 - test/fixtures/zuora_connect/app_instances.yml
 - test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/bin/setup
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/database.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/environment.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/secrets.yml
-- test/dummy/config/database.yml
-- test/dummy/config/boot.rb
-- test/dummy/README.rdoc
-- test/dummy/public/422.html
+- test/dummy/config.ru
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
 - test/dummy/public/404.html
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/helpers/application_helper.rb
-- test/test_helper.rb
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/README.rdoc